builtin-diff: fix comparison between two blobs.
[git/jnareb-git.git] / t / t2101-update-index-reupdate.sh
blob77aed8d80067798d9cedb20963ad57a3f0f8ab15
1 #!/bin/sh
3 # Copyright (c) 2006 Junio C Hamano
6 test_description='git-update-index --again test.
9 . ./test-lib.sh
11 test_expect_success 'update-index --add' \
12 'echo hello world >file1 &&
13 echo goodbye people >file2 &&
14 git-update-index --add file1 file2 &&
15 git-ls-files -s >current &&
16 cmp current - <<\EOF
17 100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
18 100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
19 EOF'
21 test_expect_success 'update-index --again' \
22 'rm -f file1 &&
23 echo hello everybody >file2 &&
24 if git-update-index --again
25 then
26 echo should have refused to remove file1
27 exit 1
28 else
29 echo happy - failed as expected
30 fi &&
31 git-ls-files -s >current &&
32 cmp current - <<\EOF
33 100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0 file1
34 100644 9db8893856a8a02eaa73470054b7c1c5a7c82e47 0 file2
35 EOF'
37 test_expect_success 'update-index --remove --again' \
38 'git-update-index --remove --again &&
39 git-ls-files -s >current &&
40 cmp current - <<\EOF
41 100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
42 EOF'
44 test_expect_success 'first commit' 'git-commit -m initial'
46 test_expect_success 'update-index again' \
47 'mkdir -p dir1 &&
48 echo hello world >dir1/file3 &&
49 echo goodbye people >file2 &&
50 git-update-index --add file2 dir1/file3 &&
51 echo hello everybody >file2
52 echo happy >dir1/file3 &&
53 git-update-index --again &&
54 git-ls-files -s >current &&
55 cmp current - <<\EOF
56 100644 53ab446c3f4e42ce9bb728a0ccb283a101be4979 0 dir1/file3
57 100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
58 EOF'
60 test_expect_success 'update-index --update from subdir' \
61 'echo not so happy >file2 &&
62 cd dir1 &&
63 cat ../file2 >file3 &&
64 git-update-index --again &&
65 cd .. &&
66 git-ls-files -s >current &&
67 cmp current - <<\EOF
68 100644 d7fb3f695f06c759dbf3ab00046e7cc2da22d10f 0 dir1/file3
69 100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
70 EOF'
72 test_expect_success 'update-index --update with pathspec' \
73 'echo very happy >file2 &&
74 cat file2 >dir1/file3 &&
75 git-update-index --again dir1/ &&
76 git-ls-files -s >current &&
77 cmp current - <<\EOF
78 100644 594fb5bb1759d90998e2bf2a38261ae8e243c760 0 dir1/file3
79 100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0 file2
80 EOF'
82 test_done