mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 19:36:30 +02:00
Code

diff-files: treat "i-t-a" files as "not-in-index" 

The `diff-files' command and related commands which call the function
`cmd_diff_files()', consider the "intent-to-add" files as a part of the
index when comparing the work-tree against it. This was previously
addressed in commits [1] and [2] by turning the option
`--ita-invisible-in-index' (introduced in [3]) on by default.

For `diff-files' (and `add -p' as a consequence) to show the i-t-a
files as as new, `ita_invisible_in_index' will be enabled by default
here as well.

[1] 0231ae71d3 (diff: turn --ita-invisible-in-index on by default,
                2018-05-26)
[2] 425a28e0a4 (diff-lib: allow ita entries treated as "not yet exist
                in index", 2016-10-24)
[3] b42b451919 (diff: add --ita-[in]visible-in-index, 2016-10-24)

Signed-off-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Srinidhi Kaushik 2020-06-20 22:08:45 +05:30 committed by Junio C Hamano
parent 101b3204f3
commit feea6946a5
2 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/diff-files.c
View File

@ -28,6 +28,13 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
repo_init_revisions(the_repository, &rev, prefix);
rev.abbrev = 0;
/*
* Consider "intent-to-add" files as new by default, unless
* explicitly specified in the command line or anywhere else.
*/
rev.diffopt.ita_invisible_in_index = 1;
precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, &rev, NULL);

55
t/t2203-add-intent.sh
View File

@ -232,17 +232,54 @@ test_expect_success 'double rename detection in status' '
)
'
test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' '
test_expect_success 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"' '
git reset --hard &&
echo new >new-ita &&
git add -N new-ita &&
git diff --summary >actual &&
echo " create mode 100644 new-ita" >expected &&
test_cmp expected actual &&
git diff --cached --summary >actual2 &&
test_must_be_empty actual2
'
: >empty &&
content="foo" &&
echo "$content" >not-empty &&
hash_e=$(git hash-object empty) &&
hash_n=$(git hash-object not-empty) &&
hash_t=$(git hash-object -t tree /dev/null) &&
cat >expect.diff_p <<-EOF &&
diff --git a/empty b/empty
new file mode 100644
index 0000000..$(git rev-parse --short $hash_e)
diff --git a/not-empty b/not-empty
new file mode 100644
index 0000000..$(git rev-parse --short $hash_n)
--- /dev/null
+++ b/not-empty
@@ -0,0 +1 @@
+$content
EOF
cat >expect.diff_s <<-EOF &&
create mode 100644 empty
create mode 100644 not-empty
EOF
cat >expect.diff_a <<-EOF &&
:000000 100644 0000000 $(git rev-parse --short $hash_t) A$(printf "\t")empty
:000000 100644 0000000 $(git rev-parse --short $hash_t) A$(printf "\t")not-empty
EOF
git add -N empty not-empty &&
git diff >actual &&
test_cmp expect.diff_p actual &&
git diff --summary >actual &&
test_cmp expect.diff_s actual &&
git diff-files -p >actual &&
test_cmp expect.diff_p actual &&
git diff-files --abbrev >actual &&
test_cmp expect.diff_a actual &&
git diff --cached >actual &&
test_must_be_empty actual
'
test_expect_success '"diff HEAD" includes ita as new files' '
git reset --hard &&