i18n: git-submodule "Submodule change[...]" messages

diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index 0ec315aa9ba2f98fa281104d0d9f214c11aeadab..4ec4d11450e0cee83ed0b3639341a1e1a0ea6f7f 100755 (executable)
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -333,6 +333,12 @@ EOF
        git log -1 --format=%B refs/notes/m > merge_commit_msg &&
        grep -q refs/notes/m merge_commit_msg &&
        grep -q refs/notes/z merge_commit_msg &&
+       # Merge commit mentions conflicting notes
+       grep -q "Conflicts" merge_commit_msg &&
+       ( for sha1 in $(cat expect_conflicts); do
+               grep -q "$sha1" merge_commit_msg ||
+               exit 1
+       done ) &&
        # Verify contents of merge result
        verify_notes m &&
        # Verify that other notes refs has not changed (w, x, y and z)
@@ -456,6 +462,12 @@ EOF
        git log -1 --format=%B refs/notes/m > merge_commit_msg &&
        grep -q refs/notes/m merge_commit_msg &&
        grep -q refs/notes/z merge_commit_msg &&
+       # Merge commit mentions conflicting notes
+       grep -q "Conflicts" merge_commit_msg &&
+       ( for sha1 in $(cat expect_conflicts); do
+               grep -q "$sha1" merge_commit_msg ||
+               exit 1
+       done ) &&
        # Verify contents of merge result
        verify_notes m &&
        # Verify that other notes refs has not changed (w, x, y and z)
@@ -465,4 +477,80 @@ EOF
        verify_notes z
 '
 
+cp expect_notes_y expect_notes_m
+cp expect_log_y expect_log_m
+
+test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
+       git update-ref refs/notes/m refs/notes/y &&
+       test_must_fail git notes merge z >output &&
+       # Output should point to where to resolve conflicts
+       grep -q "\\.git/NOTES_MERGE_WORKTREE" output &&
+       # Inspect merge conflicts
+       ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+       test_cmp expect_conflicts output_conflicts &&
+       ( for f in $(cat expect_conflicts); do
+               test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+               exit 1
+       done ) &&
+       # Verify that current notes tree (pre-merge) has not changed (m == y)
+       verify_notes y &&
+       verify_notes m &&
+       test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+'
+
+cp expect_notes_w expect_notes_m
+cp expect_log_w expect_log_m
+
+test_expect_success 'reset notes ref m to somewhere else (w)' '
+       git update-ref refs/notes/m refs/notes/w &&
+       verify_notes m &&
+       test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+'
+
+test_expect_success 'fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)' '
+       # Resolve conflicts
+       cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+       cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
+y and z notes on 4th commit
+EOF
+       # Fail to finalize merge
+       test_must_fail git notes merge --commit >output 2>&1 &&
+       # .git/NOTES_MERGE_* must remain
+       test -f .git/NOTES_MERGE_PARTIAL &&
+       test -f .git/NOTES_MERGE_REF &&
+       test -f .git/NOTES_MERGE_WORKTREE/$commit_sha1 &&
+       test -f .git/NOTES_MERGE_WORKTREE/$commit_sha2 &&
+       test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
+       test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
+       # Refs are unchanged
+       test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+       test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)"
+       test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)"
+       # Mention refs/notes/m, and its current and expected value in output
+       grep -q "refs/notes/m" output &&
+       grep -q "$(git rev-parse refs/notes/m)" output &&
+       grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
+       # Verify that other notes refs has not changed (w, x, y and z)
+       verify_notes w &&
+       verify_notes x &&
+       verify_notes y &&
+       verify_notes z
+'
+
+test_expect_success 'resolve situation by aborting the notes merge' '
+       git notes merge --abort &&
+       # No .git/NOTES_MERGE_* files left
+       test_must_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
+       test_cmp /dev/null output &&
+       # m has not moved (still == w)
+       test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+       # Verify that other notes refs has not changed (w, x, y and z)
+       verify_notes w &&
+       verify_notes x &&
+       verify_notes y &&
+       verify_notes z
+'
+
 test_done