read-tree: "read-tree -m --empty" does not make sense
fb1bb965 ("read-tree: deprecate syntax without tree-ish args", 2010-09-10) wanted to deprecate "git read-tree" without any tree, which used to be the way to empty the index, and encourage use of "git read-tree --empty" instead. However, when used with "-m", "--empty" does not make any sense, either, simply because merging 0 trees will result in a different error anyway. Omit the deprecation warning and let the code to emit real error message diagnose the error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 10, 2017 at 21:31 UTC
b9b10d36816b8c7276bb83eb08fdbb59f68ef99b
1 file changed
+1
-1
builtin/read-tree.c
+1
-1
@@ -181,7 +181,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
181
die("failed to unpack tree object %s", arg);
182
stage++;
183
}
184
- if (nr_trees == 0 && !read_empty)
184
+ if (!nr_trees && !read_empty && !opts.merge)
185
warning("read-tree: emptying the index with no arguments is deprecated; use --empty");
186
else if (nr_trees > 0 && read_empty)
187
die("passing trees as arguments contradicts --empty");