Merge branch 'jk/merge-tree-added-identically'

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 69212cdde14c012261eabc4ac9b2e5956213f8d5..dbb02e2afd16b2ca53f18107f5f07af37f217c9b 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -186,4 +186,18 @@ test_expect_success GPG 'push signed tag with signed-tags capability' '
        compare_refs local signed-tag-2 server signed-tag-2
 '
 
+test_expect_success 'push messages' '
+       (cd local &&
+       git checkout -b new_branch master &&
+       echo new >>file &&
+       git commit -a -m new &&
+       git push origin new_branch &&
+       git fetch origin &&
+       echo new >>file &&
+       git commit -a -m new &&
+       git push origin new_branch 2> msg &&
+       ! grep "\[new branch\]" msg
+       )
+'
+
 test_done