Merge branch 'sg/complete-decorate-full-not-long' into maint

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b16462132fd01f21cfd2af40a3c769803b0b7c50..75c50eea15e54995364fb8c81d0760446175f46e 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -133,7 +133,7 @@ test_expect_success 'setup' '
        test_tick &&
        git commit -m "commit 3" &&
        git tag c3 &&
-       c3=$(git rev-parse HEAD)
+       c3=$(git rev-parse HEAD) &&
        git reset --hard "$c0" &&
        create_merge_msgs
 '