# [PATCH] Show error for 'git merge' with unset merge.defaultToUpstream 2 messages from 2011-11-21 to 2011-11-21. Participants: Vincent van Ravesteijn, Junio C Hamano. Thread: https://gitlist.dev/t/28992 ## Vincent van Ravesteijn, 2011-11-21 13:30 Subject: [PATCH] Show error for 'git merge' with unset merge.defaultToUpstream Message-ID: <1321882240-3783-1-git-send-email-vfr@lyx.org> URL: https://gitlist.dev/e/1321882240-3783-1-git-send-email-vfr%40lyx.org ``` 'git merge' can be called without any arguments if merge.defaultToUpstream is set. However, when merge.defaultToUpstream is not set, the user will be presented the usage information as if he entered a command with a wrong syntaxis. Ironically, the usage information confirms that no arguments are mandatory. This adds a proper error message telling the user why the command failed. As a side-effect this can help the user in discovering the possibility to merge with the upstream branch by setting merge.defaultToUpstream. Signed-off-by: Vincent van Ravesteijn --- builtin/merge.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index dffd5ec..900a297 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1160,9 +1160,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) die(_("You cannot combine --no-ff with --ff-only.")); if (!abort_current_merge) { - if (!argc && default_to_upstream) - argc = setup_with_upstream(&argv); - else if (argc == 1 && !strcmp(argv[0], "-")) + if (!argc) { + if (default_to_upstream) + argc = setup_with_upstream(&argv); + else + die(_("No commit specified and merge.defaultToUpstream not set.")); + } else if (argc == 1 && !strcmp(argv[0], "-")) argv[0] = "@{-1}"; } if (!argc) -- 1.7.4.1 ``` ## Junio C Hamano, 2011-11-21 17:30 Subject: Re: [PATCH] Show error for 'git merge' with unset merge.defaultToUpstream Message-ID: <7vbos5gz87.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbos5gz87.fsf%40alter.siamese.dyndns.org In-Reply-To: <1321882240-3783-1-git-send-email-vfr@lyx.org> ``` Smells correct from a cursory look; thanks. ```