push: change needlessly ambiguous example in error
Change an example push added in b55e677522 ("push: introduce new push.default mode "simple"", 2012-04-24) to always mean the same thing whether the current setting happens to be "simple" or not. This error is only emitted under "simple", but message is explaining to the user that they can get two sorts of different behaviors by these two invocations. Let's use "git push <remote> HEAD" which always means push the current branch name to that remote, instead of "git push <remote> <current-branch-name>" which will do that under "simple", but is not guaranteed to do under "upstream". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Nov 13, 2018 at 20:39 UTC
8247166717fc5a3f26e4db1067891da12644808b
1 file changed
+2
-2
builtin/push.c
+2
-2
@@ -173,10 +173,10 @@ static NORETURN int die_push_simple(struct branch *branch, struct remote *remote
173
"\n"
174
"To push to the branch of the same name on the remote, use\n"
175
"\n"
176
- " git push %s %s\n"
176
+ " git push %s HEAD\n"
177
"%s"),
178
remote->name, short_upstream,
179
- remote->name, branch->name, advice_maybe);
179
+ remote->name, advice_maybe);
180
}
181
182
static const char message_detached_head_die[] =