diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 09:11:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 09:11:59 +0200 |
| commit | af24059fa299f1656692f5807eddd3b30b5f3cfb (patch) | |
| tree | c5e12eb4c91edd04e9c8fea6408678c5660946e4 /t/t5505-remote.sh | |
| parent | Git 1.7.2.3 (diff) | |
| parent | tag.c: whitespace breakages fix (diff) | |
| download | git-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.xz git-af24059fa299f1656692f5807eddd3b30b5f3cfb.zip | |
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-x | t/t5505-remote.sh | 2 |
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) ' |