diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:59 +0900 |
| commit | 0501b7e78564d11e87d228f7ffdbdb4b147145e3 (patch) | |
| tree | dd388bb6e4b8ca0bb876fe0ceec01379d492d0fc /builtin/read-tree.c | |
| parent | Merge branch 'bw/submodule-with-bs-path' into maint (diff) | |
| parent | git-filter-branch: be more direct in an error message (diff) | |
| download | tgif-0501b7e78564d11e87d228f7ffdbdb4b147145e3.tar.xz | |
Merge branch 'ja/do-not-ask-needless-questions' into maint
Git sometimes gives an advice in a rhetorical question that does
not require an answer, which can confuse new users and non native
speakers. Attempt to rephrase them.
* ja/do-not-ask-needless-questions:
git-filter-branch: be more direct in an error message
read-tree -m: make error message for merging 0 trees less smart aleck
usability: don't ask questions if no reply is required
Diffstat (limited to 'builtin/read-tree.c')
| -rw-r--r-- | builtin/read-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 23e212ee8c..3834425679 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) setup_work_tree(); if (opts.merge) { - if (stage < 2) - die("just how do you expect me to merge %d trees?", stage-1); switch (stage - 1) { + case 0: + die("you must specify at least one tree to merge"); + break; case 1: opts.fn = opts.prefix ? bind_merge : oneway_merge; break; |