diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-10 21:31:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-10 21:42:17 -0700 |
| commit | b9b10d36816b8c7276bb83eb08fdbb59f68ef99b (patch) | |
| tree | c6f0a165bb7a66b646907abe9a0b5aadb3a796de | |
| parent | 840ed141983718e0c5518a325534a5656797132a (diff) | |
| download | git-jc/read-tree-empty-with-m.tar.gz | |
read-tree: "read-tree -m --empty" does not make sensejc/read-tree-empty-with-m
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>
| -rw-r--r-- | builtin/read-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 8c693e7568..ce5265dde2 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -181,7 +181,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) die("failed to unpack tree object %s", arg); stage++; } - if (nr_trees == 0 && !read_empty) + if (!nr_trees && !read_empty && !opts.merge) warning("read-tree: emptying the index with no arguments is deprecated; use --empty"); else if (nr_trees > 0 && read_empty) die("passing trees as arguments contradicts --empty"); |