[PATCH 1/2] diff --cached: do not report i-t-a entries as "new"
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Mar 9, 2015, 14:14 UTC
- Message-ID
- <1425910445-27383-2-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1425910445-27383-1-git-send-email-pclouds@gmail.com>
Paths marked by "git add -N" are simply a reminder to the user that these files should be staged. If the user does not stage any of them, "git commit" will not record them.
Align the behavior of "diff --cached" and "git commit". The most prominent result of this patch is "git status" no longer reports i-t-a paths as "Changes to be committed".
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- diff-lib.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/diff-lib.c b/diff-lib.c index a85c497..db0e6f8 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -400,6 +400,8 @@ static void do_oneway_diff(struct unpack_trees_options *o, * Something added to the tree? */ if (!tree) { + if (idx && (idx->ce_flags & CE_INTENT_TO_ADD)) + return; show_new_file(revs, idx, cached, match_missing); return; }
-- 2.3.0.rc1.137.g477eb31