summaryrefslogtreecommitdiff
path: root/t/t6028-merge-up-to-date.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
-rwxr-xr-xt/t6028-merge-up-to-date.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh
index c518e9c..7763c1b 100755
--- a/t/t6028-merge-up-to-date.sh
+++ b/t/t6028-merge-up-to-date.sh
@@ -83,7 +83,7 @@ test_expect_success 'merge fast-forward octopus' '
git reset --hard c0 &&
test_tick &&
- git merge c1 c2
+ git merge c1 c2 &&
expect=$(git rev-parse c2) &&
current=$(git rev-parse HEAD) &&
test "$expect" = "$current"