Skip to content
Permalink
Browse files
Merge pull request #2733 from dscho/difftool-ita-g4w
Fix `git difftool` with intent-to-add files
  • Loading branch information
dscho committed Jul 7, 2020
2 parents 53ca6a2 + 0c87084 commit 51f9af323b04dbe37018a40287071ef91b9546ac
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 10 deletions.
@@ -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);
@@ -220,8 +220,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
} else if (revs->diffopt.ita_invisible_in_index &&
ce_intent_to_add(ce)) {
diff_addremove(&revs->diffopt, '+', ce->ce_mode,
the_hash_algo->empty_tree, 0,
ce->name, 0);
&null_oid, 0, ce->name, 0);
continue;
}

@@ -232,17 +232,53 @@ 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 &&
: >empty &&
content="foo" &&
echo "$content" >not-empty &&
hash_e=$(git hash-object empty) &&
hash_n=$(git hash-object not-empty) &&
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 0000000 A$(printf "\t")empty
:000000 100644 0000000 0000000 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 &&
echo " create mode 100644 new-ita" >expected &&
test_cmp expected actual &&
git diff --cached --summary >actual2 &&
test_must_be_empty actual2
'
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 &&
@@ -720,6 +720,14 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
test_cmp expect actual
'

test_expect_success 'add -N and difftool -d' '
test_when_finished git reset --hard &&
test_write_lines A B C >intent-to-add &&
git add -N intent-to-add &&
git difftool --dir-diff --extcmd ls
'

test_expect_success 'outside worktree' '
echo 1 >1 &&
echo 2 >2 &&

0 comments on commit 51f9af3

Please sign in to comment.