summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Noel Avila <jn.avila@free.fr>2017-05-11 12:06:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-12 06:23:39 (GMT)
commit9932242f597b2990117430546e411793090e22e2 (patch)
treeb237123d9502b84e5edbcd641060aa719b21696a
parent6c486862636be1fe2d5785451c52f5379b0bad24 (diff)
downloadgit-9932242f597b2990117430546e411793090e22e2.zip
git-9932242f597b2990117430546e411793090e22e2.tar.gz
git-9932242f597b2990117430546e411793090e22e2.tar.bz2
read-tree -m: make error message for merging 0 trees less smart aleck
"git read-tree -m" requires a tree argument to name the tree to be merged in. Git uses a cutesy error message to say so and why: $ git read-tree -m warning: read-tree: emptying the index with no arguments is deprecated; use --empty fatal: just how do you expect me to merge 0 trees? $ git read-tree -m --empty fatal: just how do you expect me to merge 0 trees? When lucky, that could produce an ah-hah moment for the user, but it's more likely to irritate and distract them. Instead, tell the user plainly that the tree argument is required. Also document this requirement in the git-read-tree(1) manpage where there is room to explain it in a more straightforward way. Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--builtin/read-tree.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index fa1d557..6bb725b 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -131,7 +131,7 @@ Merging
-------
If `-m` is specified, 'git read-tree' can perform 3 kinds of
merge, a single tree merge if only 1 tree is given, a
-fast-forward merge with 2 trees, or a 3-way merge if 3 trees are
+fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are
provided.
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 8ba64bc..8eae1e8 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -197,9 +197,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;