| commit | b9b10d36816b8c7276bb83eb08fdbb59f68ef99b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 May 2017 04:31:54 +0000 (10 21:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 May 2017 04:42:17 +0000 (10 21:42 -0700) | ||
| tree | c6f0a165bb7a66b646907abe9a0b5aadb3a796de | treesnapshot (tar.gz zip) |
| parent | 840ed141983718e0c5518a325534a5656797132a | commitdiff |
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>
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>
| builtin/read-tree.c | diffblobblamehistory |