| commit | 4b4e26d21f77d9e90125ca1c8f48592a9cd6f543 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Nov 2008 08:10:25 +0000 (16 00:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Nov 2008 08:15:50 +0000 (16 00:15 -0800) | ||
| tree | 447f21f17a4292809577edface34daccc967f737 | treesnapshot (tar.gz zip) |
| parent | 07e77e40ff5d2cb6c7e2c5a68d9748f7811da85e | commitdiff |
Teach ls-files --with-tree=<tree> to work with options other than -c
Originally --with-tree=<tree> was designed for the sole purpose of
checking if a given pathspec makes sense as a parameter to git-commit
using it in conjunction with --error-unmatch. It had logic to avoid
showing the same entry (one came from the original index, another from the
overlayed tree) twice so that it works with -c (i.e. "show-cached"), but
otherwise it was not designed to work with the flags such as -m, -d, etc.
This teaches the same logic to cover the codepath for -m and -d.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Originally --with-tree=<tree> was designed for the sole purpose of
checking if a given pathspec makes sense as a parameter to git-commit
using it in conjunction with --error-unmatch. It had logic to avoid
showing the same entry (one came from the original index, another from the
overlayed tree) twice so that it works with -c (i.e. "show-cached"), but
otherwise it was not designed to work with the flags such as -m, -d, etc.
This teaches the same logic to cover the codepath for -m and -d.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-ls-files.c | diffblobblamehistory |