mirror of
https://github.com/git/git.git
synced 2024-12-03 06:53:53 +08:00
78cc1a540b
This reverts commit d95d728aba.
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>
87 lines
1.9 KiB
Bash
Executable File
87 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Intent to add'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'intent to add' '
|
|
echo hello >file &&
|
|
echo hello >elif &&
|
|
git add -N file &&
|
|
git add elif
|
|
'
|
|
|
|
test_expect_success 'check result of "add -N"' '
|
|
git ls-files -s file >actual &&
|
|
empty=$(git hash-object --stdin </dev/null) &&
|
|
echo "100644 $empty 0 file" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'intent to add is just an ordinary empty blob' '
|
|
git add -u &&
|
|
git ls-files -s file >actual &&
|
|
git ls-files -s elif | sed -e "s/elif/file/" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'intent to add does not clobber existing paths' '
|
|
git add -N file elif &&
|
|
empty=$(git hash-object --stdin </dev/null) &&
|
|
git ls-files -s >actual &&
|
|
! grep "$empty" actual
|
|
'
|
|
|
|
test_expect_success 'i-t-a entry is simply ignored' '
|
|
test_tick &&
|
|
git commit -a -m initial &&
|
|
git reset --hard &&
|
|
|
|
echo xyzzy >rezrov &&
|
|
echo frotz >nitfol &&
|
|
git add rezrov &&
|
|
git add -N nitfol &&
|
|
git commit -m second &&
|
|
test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
|
|
test $(git diff --name-only HEAD -- nitfol | wc -l) = 1
|
|
'
|
|
|
|
test_expect_success 'can commit with an unrelated i-t-a entry in index' '
|
|
git reset --hard &&
|
|
echo bozbar >rezrov &&
|
|
echo frotz >nitfol &&
|
|
git add rezrov &&
|
|
git add -N nitfol &&
|
|
git commit -m partial rezrov
|
|
'
|
|
|
|
test_expect_success 'can "commit -a" with an i-t-a entry' '
|
|
git reset --hard &&
|
|
: >nitfol &&
|
|
git add -N nitfol &&
|
|
git commit -a -m all
|
|
'
|
|
|
|
test_expect_success 'cache-tree invalidates i-t-a paths' '
|
|
git reset --hard &&
|
|
mkdir dir &&
|
|
: >dir/foo &&
|
|
git add dir/foo &&
|
|
git commit -m foo &&
|
|
|
|
: >dir/bar &&
|
|
git add -N dir/bar &&
|
|
git diff --cached --name-only >actual &&
|
|
echo dir/bar >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
git write-tree >/dev/null &&
|
|
|
|
git diff --cached --name-only >actual &&
|
|
echo dir/bar >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|
|
|