summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-12 23:29:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-14 00:53:35 (GMT)
commit9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c (patch)
tree457748008fe30ca454deae3f4485006de71b6606 /Documentation/git-cvsimport.txt
parent1be0659efca4a1f69c851f95563e930d70d8baf2 (diff)
downloadgit-9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c.zip
git-9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c.tar.gz
git-9e9b26751a5ca7a257b3e1cfb319fe3e4efc663c.tar.bz2
git-push: avoid falling back on pushing "matching" refs.
The underlying "git send-pack remote.host:path" pushes all the matching refs that both local and remote have, and "git push" blindly inherits this property. Which probably was a mistake. A typical cloned repository (e.g. a subsystem repository cloned from Linus repository) has at least two branches, "master" to keep the subsystem and "origin" that records tip of Linus "master" when the repository was cloned. If this is the public repository for the subsystem, then subsystem developers would clone it, and then cloned ones have "master" and "origin". When developers use this public subsystem repository as a shared repository, pushing into it via "git push subsys:/path/name" would try to push the matching refs, "master" and "origin", from the developers' repositories. The "origin" in the public shared repository does not have much relevance, yet pushing into "origin" would cause "not a fast forward" checks to be triggered. Arguably "git push subsys:/path/name master" would work it around, but having them to say it explicitly to avoid pushing into "origin" as well is bad. This commit requires you to give at least one refspec to git-push. You could "give" by either: (1) Listing the refspec(s) explicitly on the command line. E.g. "git push subsys:/path/name master". (2) Using --all or --tags on the command line. E.g. "git push --tags subsys:/path/name". (3) Using a $GIT_DIR/remotes shorthand with 'Push: refspec' line in it. Unlike pull that can happen pretty much promiscuously, people will push into the same set of a limited number of remote repositories repeatedly over the life of the project, so it is reasonable to assume they would want to keep a $GIT_DIR/remotes/ entry for those repositories even only to save typing the URL, so keeping the default 'Push: refspec' line in such is a sensible thing to do. It was suggested to further fall back on pushing the current branch, but this commit does not implement it. If developers adopt topic branch workflow, pushing to public while on a topic branch by mistake would expose the topic branch to the public repository. Not falling back to the current branch prevents that mistake from happening. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsimport.txt')
0 files changed, 0 insertions, 0 deletions