git/builtin-push.c, branch v1.6.3

Merge branch 'fg/push-default'

2009-03-26T07:26:25Z

* fg/push-default: builtin-push.c: Fix typo: "anythig" -> "anything" Display warning for default git push with no push.default config New config push.default to decide default behavior for push Conflicts: Documentation/config.txt

builtin-push.c: Fix typo: "anythig" -> "anything"

2009-03-25T22:05:46Z

Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano

Display warning for default git push with no push.default config

2009-03-17T21:50:21Z

If a git push without any refspecs is attempted, display a warning. The current default behavior is to push all matching refspecs, which may come as a surprise to new users, so the warning shows how push.default can be configured and what the possible values are. Traditionalists who wish to keep the current behaviour are also told how to configure this once and never see the warning again. Signed-off-by: Finn Arne Gangstad Signed-off-by: Junio C Hamano

New config push.default to decide default behavior for push

2009-03-17T21:50:21Z

When "git push" is not told what refspecs to push, it pushes all matching branches to the current remote. For some workflows this default is not useful, and surprises new users. Some have even found that this default behaviour is too easy to trigger by accident with unwanted consequences. Introduce a new configuration variable "push.default" that decides what action git push should take if no refspecs are given or implied by the command line arguments or the current remote configuration. Possible values are: 'nothing' : Push nothing; 'matching' : Current default behaviour, push all branches that already exist in the current remote; 'tracking' : Push the current branch to whatever it is tracking; 'current' : Push the current branch to a branch of the same name, i.e. HEAD. Signed-off-by: Finn Arne Gangstad Signed-off-by: Junio C Hamano

Give error when no remote is configured

2009-03-11T06:14:20Z

When there's no explicitly-named remote, we use the remote specified for the current branch, which in turn defaults to "origin". But it this case should require the remote to actually be configured, and not fall back to the path "origin". Possibly, the config file's "remote = something" should require the something to be a configured remote instead of a bare repository URL, but we actually test with a bare repository URL. In fetch, we were giving the sensible error message when coming up with a URL failed, but this wasn't actually reachable, so move that error up and use it when appropriate. In push, we need a new error message, because the old one (formerly unreachable without a lot of help) used the repo name, which was NULL. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-10-08T15:05:43Z

* maint: Do not use errno when pread() returns 0 git init: --bare/--shared overrides system/global config git-push.txt: Describe --repo option in more detail git rm: refresh index before up-to-date check Fix a few typos in relnotes

git-push.txt: Describe --repo option in more detail

2008-10-08T14:15:53Z

The --repo option was described in a way that the reader would have to assume that it is the same as the parameter. But it actually servers a purpose, which is now written down. Furthermore, the --mirror option was missing from the synopsis. Signed-off-by: Johannes Sixt Signed-off-by: Shawn O. Pearce

Make push more verbose about illegal combination of options

2008-08-17T07:24:21Z

It may be unclear that --all, --mirror, --tags and/or explicit refspecs are illegal combinations for git push. Git was silently failing in these cases, while we can complaint more properly about it. Signed-off-by: Marek Zawirski Signed-off-by: Junio C Hamano

builtin-push.c: Cleanup - use OPT_BIT() and remove some variables

2008-07-20T21:41:49Z

Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

Make usage strings dash-less

2008-07-13T21:12:48Z

When you misuse a git command, you are shown the usage string. But this is currently shown in the dashed form. So if you just copy what you see, it will not work, when the dashed form is no longer supported. This patch makes git commands show the dash-less version. For shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh generates a dash-less usage string now. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano