3 # Copyright (c) 2010 Johan Herland
6 test_description
='Test merging of notes trees'
10 test_expect_success setup
'
16 # Create notes on 4 first commits
17 git config core.notesRef refs/notes/x &&
18 git notes add -m "Notes on 1st commit" 1st &&
19 git notes add -m "Notes on 2nd commit" 2nd &&
20 git notes add -m "Notes on 3rd commit" 3rd &&
21 git notes add -m "Notes on 4th commit" 4th
24 commit_sha1
=$
(git rev-parse
1st^
{commit
})
25 commit_sha2
=$
(git rev-parse
2nd^
{commit
})
26 commit_sha3
=$
(git rev-parse
3rd^
{commit
})
27 commit_sha4
=$
(git rev-parse
4th^
{commit
})
28 commit_sha5
=$
(git rev-parse
5th^
{commit
})
32 git
-c core.notesRef
="refs/notes/$notes_ref" notes |
33 sort >"output_notes_$notes_ref" &&
34 test_cmp
"expect_notes_$notes_ref" "output_notes_$notes_ref" &&
35 git
-c core.notesRef
="refs/notes/$notes_ref" log
--format="%H %s%n%N" \
36 >"output_log_$notes_ref" &&
37 test_cmp
"expect_log_$notes_ref" "output_log_$notes_ref"
40 cat <<EOF | sort >expect_notes_x
41 5e93d24084d32e1cb61f7070505b9d2530cca987 $commit_sha4
42 8366731eeee53787d2bdf8fc1eff7d94757e8da0 $commit_sha3
43 eede89064cd42441590d6afec6c37b321ada3389 $commit_sha2
44 daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
47 cat >expect_log_x
<<EOF
64 test_expect_success
'verify initial notes (x)' '
68 cp expect_notes_x expect_notes_y
69 cp expect_log_x expect_log_y
71 test_expect_success
'fail to merge empty notes ref into empty notes ref (z => y)' '
72 test_must_fail git -c "core.notesRef=refs/notes/y" notes merge z
75 test_expect_success
'fail to merge into various non-notes refs' '
76 test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
77 test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
78 mkdir -p .git/refs/notes/dir &&
79 test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
80 test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
81 test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&
82 test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x &&
83 test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x &&
84 test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
87 test_expect_success
'fail to merge various non-note-trees' '
88 git config core.notesRef refs/notes/y &&
89 test_must_fail git notes merge refs/notes &&
90 test_must_fail git notes merge refs/notes/ &&
91 test_must_fail git notes merge refs/notes/dir &&
92 test_must_fail git notes merge refs/notes/dir/ &&
93 test_must_fail git notes merge refs/heads/master &&
94 test_must_fail git notes merge x: &&
95 test_must_fail git notes merge x:foo &&
96 test_must_fail git notes merge foo^{bar
99 test_expect_success
'merge notes into empty notes ref (x => y)' '
100 git config core.notesRef refs/notes/y &&
103 # x and y should point to the same notes commit
104 test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
107 test_expect_success
'merge empty notes ref (z => y)' '
109 # y should not change (still == x)
110 test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"
113 test_expect_success
'change notes on other notes ref (y)' '
114 # Not touching notes to 1st commit
115 git notes remove 2nd &&
116 git notes append -m "More notes on 3rd commit" 3rd &&
117 git notes add -f -m "New notes on 4th commit" 4th &&
118 git notes add -m "Notes on 5th commit" 5th
121 test_expect_success
'merge previous notes commit (y^ => y) => No-op' '
122 pre_state="$(git rev-parse refs/notes/y)" &&
123 git notes merge y^ &&
125 test "$pre_state" = "$(git rev-parse refs/notes/y)"
128 cat <<EOF | sort >expect_notes_y
129 0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
130 dec2502dac3ea161543f71930044deff93fa945c $commit_sha4
131 4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3
132 daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
135 cat >expect_log_y
<<EOF
140 New notes on 4th commit
145 More notes on 3rd commit
154 test_expect_success
'verify changed notes on other notes ref (y)' '
158 test_expect_success
'verify unchanged notes on original notes ref (x)' '
162 test_expect_success
'merge original notes (x) into changed notes (y) => No-op' '
163 git notes merge -vvv x &&
168 cp expect_notes_y expect_notes_x
169 cp expect_log_y expect_log_x
171 test_expect_success
'merge changed (y) into original (x) => Fast-forward' '
172 git config core.notesRef refs/notes/x &&
176 # x and y should point to same the notes commit
177 test "$(git rev-parse refs/notes/x)" = "$(git rev-parse refs/notes/y)"