blob: 2a4a749b4fa3b07963a18b645d29ef774c01bbd1 [file] [log] [blame]
Junio C Hamano39425812008-08-21 01:44:53 -07001#!/bin/sh
2
3test_description='Intent to add'
4
5. ./test-lib.sh
6
7test_expect_success 'intent to add' '
8 echo hello >file &&
9 echo hello >elif &&
10 git add -N file &&
Junio C Hamano78cc1a52015-06-23 10:27:47 -070011 git add elif
Junio C Hamano39425812008-08-21 01:44:53 -070012'
13
14test_expect_success 'check result of "add -N"' '
15 git ls-files -s file >actual &&
16 empty=$(git hash-object --stdin </dev/null) &&
17 echo "100644 $empty 0 file" >expect &&
18 test_cmp expect actual
19'
20
21test_expect_success 'intent to add is just an ordinary empty blob' '
22 git add -u &&
23 git ls-files -s file >actual &&
24 git ls-files -s elif | sed -e "s/elif/file/" >expect &&
25 test_cmp expect actual
26'
27
28test_expect_success 'intent to add does not clobber existing paths' '
29 git add -N file elif &&
30 empty=$(git hash-object --stdin </dev/null) &&
31 git ls-files -s >actual &&
32 ! grep "$empty" actual
33'
34
Junio C Hamano3f6d56d2012-02-07 11:55:48 -080035test_expect_success 'i-t-a entry is simply ignored' '
Junio C Hamano331fcb52008-11-28 19:56:34 -080036 test_tick &&
37 git commit -a -m initial &&
38 git reset --hard &&
39
40 echo xyzzy >rezrov &&
41 echo frotz >nitfol &&
42 git add rezrov &&
43 git add -N nitfol &&
Junio C Hamano3f6d56d2012-02-07 11:55:48 -080044 git commit -m second &&
45 test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
Junio C Hamano78cc1a52015-06-23 10:27:47 -070046 test $(git diff --name-only HEAD -- nitfol | wc -l) = 1
Junio C Hamano331fcb52008-11-28 19:56:34 -080047'
48
49test_expect_success 'can commit with an unrelated i-t-a entry in index' '
50 git reset --hard &&
Junio C Hamano3f6d56d2012-02-07 11:55:48 -080051 echo bozbar >rezrov &&
Junio C Hamano331fcb52008-11-28 19:56:34 -080052 echo frotz >nitfol &&
53 git add rezrov &&
54 git add -N nitfol &&
55 git commit -m partial rezrov
56'
57
58test_expect_success 'can "commit -a" with an i-t-a entry' '
59 git reset --hard &&
60 : >nitfol &&
61 git add -N nitfol &&
62 git commit -a -m all
63'
64
Nguyễn Thái Ngọc Duyeec3e7e2012-12-16 11:15:28 +070065test_expect_success 'cache-tree invalidates i-t-a paths' '
66 git reset --hard &&
67 mkdir dir &&
68 : >dir/foo &&
69 git add dir/foo &&
70 git commit -m foo &&
71
72 : >dir/bar &&
73 git add -N dir/bar &&
74 git diff --cached --name-only >actual &&
Junio C Hamano78cc1a52015-06-23 10:27:47 -070075 echo dir/bar >expect &&
Nguyễn Thái Ngọc Duyeec3e7e2012-12-16 11:15:28 +070076 test_cmp expect actual &&
77
78 git write-tree >/dev/null &&
79
80 git diff --cached --name-only >actual &&
Junio C Hamano78cc1a52015-06-23 10:27:47 -070081 echo dir/bar >expect &&
Nguyễn Thái Ngọc Duyeec3e7e2012-12-16 11:15:28 +070082 test_cmp expect actual
83'
84
Junio C Hamano39425812008-08-21 01:44:53 -070085test_done
86