summaryrefslogtreecommitdiff
path: root/t/t5505-remote.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-06 00:11:59 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-06 00:11:59 -0700
commitaf24059fa299f1656692f5807eddd3b30b5f3cfb (patch)
treec5e12eb4c91edd04e9c8fea6408678c5660946e4 /t/t5505-remote.sh
parentdd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff)
parentd2c030d4773f1f00165bffc34e2487043df326e7 (diff)
downloadgit-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.gz
Merge branch 'xx/trivial' into maint
* xx/trivial: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&
Diffstat (limited to 't/t5505-remote.sh')
-rwxr-xr-xt/t5505-remote.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 4c498b1902..5d1c66ea71 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -435,7 +435,7 @@ test_expect_success 'update --prune' '
git branch -m side2 side3) &&
(cd test &&
git remote update --prune &&
- (cd ../one && git branch -m side3 side2)
+ (cd ../one && git branch -m side3 side2) &&
git rev-parse refs/remotes/origin/side3 &&
test_must_fail git rev-parse refs/remotes/origin/side2)
'