diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-23 10:27:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-23 10:37:21 -0700 |
| commit | 78cc1a540ba127b13f2f3fd531777b57f3a9cd46 (patch) | |
| tree | 9f4d294accbb456727dad9dc231afc862d535433 /t/t4011-diff-symlink.sh | |
| parent | d95d728aba06a34394d15466045cbdabdada58a2 (diff) | |
| download | git-78cc1a540ba127b13f2f3fd531777b57f3a9cd46.tar.gz | |
Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-a
This reverts commit d95d728aba06a34394d15466045cbdabdada58a2.
It turns out that many other commands that need to interact with the
result of running diff-files and diff-index, e.g. "git apply", "git
rm", etc., need to be adjusted to the new world order it brings in.
For example, it would break this sequence to correct a whitespace
breakage in the parts you changed:
git add -N file
git diff --cached file | git apply --cached --whitespace=fix
git checkout file
In the old world order, "diff" showed a patch to modify an existing
empty file by adding its full contents, and "apply" updated the
index by modifying the existing empty blob (which is what an
Intent-to-Add entry records in the index) with that patch.
In the new world order, "diff" shows a patch to create a new file
with its full contents, but because "apply" thinks that the i-t-a
entry already exists in the index, it refused to accept a creation.
Adjusting "apply" to this new world order is easy, but we need to
assess the extent of the damage to the rest of the system the new
world order brought in before going forward and adjust them all,
after which we can resurrect the commit being reverted here.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4011-diff-symlink.sh')
| -rwxr-xr-x | t/t4011-diff-symlink.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh index 7452fce0da..13e7f621ab 100755 --- a/t/t4011-diff-symlink.sh +++ b/t/t4011-diff-symlink.sh @@ -139,13 +139,11 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' ' test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' ' cat >expect <<-\EOF && diff --git a/file.bin b/file.bin - new file mode 100644 - index 0000000..d95f3ad - Binary files /dev/null and b/file.bin differ + index e69de29..d95f3ad 100644 + Binary files a/file.bin and b/file.bin differ diff --git a/link.bin b/link.bin - new file mode 120000 - index 0000000..dce41ec - --- /dev/null + index e69de29..dce41ec 120000 + --- a/link.bin +++ b/link.bin @@ -0,0 +1 @@ +file.bin |