diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:00 +0300 |
| commit | 8a17b259e2c9137c1653523e00a988cb3cee3a1f (patch) | |
| tree | 971cb91c93753f1c0a88b20a5ac1eb0a8f840074 /builtin | |
| parent | 34a75ccb1dade147f404c0841c3f1ec777c0a97a (diff) | |
| parent | b9b10d36816b8c7276bb83eb08fdbb59f68ef99b (diff) | |
Merge branch 'jc/read-tree-empty-with-m' into maint
"git read-tree -m" (no tree-ish) gave a nonsense suggestion "use
--empty if you want to clear the index". With "-m", such a request
will still fail anyway, as you'd need to name at least one tree-ish
to be merged.
* jc/read-tree-empty-with-m:
read-tree: "read-tree -m --empty" does not make sense
Diffstat (limited to 'builtin')
| -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 3834425679..a52a9e11bb 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -210,7 +210,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"); |