diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3310-notes-merge-manual-resolve.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 0ec315aa9b..287fab82d7 100755 --- 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) |