mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
331fcb598e
Writing a tree out of an index with an "intent to add" entry is blocked. This implies that you cannot "git commit" from such a state; however you can still do "git commit -a" or "git commit $that_path". Signed-off-by: Junio C Hamano <gitster@pobox.com>
65 lines
1.3 KiB
Bash
Executable File
65 lines
1.3 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 'cannot commit with i-t-a entry' '
|
|
test_tick &&
|
|
git commit -a -m initial &&
|
|
git reset --hard &&
|
|
|
|
echo xyzzy >rezrov &&
|
|
echo frotz >nitfol &&
|
|
git add rezrov &&
|
|
git add -N nitfol &&
|
|
test_must_fail git commit
|
|
'
|
|
|
|
test_expect_success 'can commit with an unrelated i-t-a entry in index' '
|
|
git reset --hard &&
|
|
echo xyzzy >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_done
|
|
|