diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:12:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 00:12:04 -0700 |
| commit | 4682693e9ccc04252d0fad6f5627fc056abcdbba (patch) | |
| tree | cfd7ed7e969a2f461d24a111187613cb9ba87f9a /t | |
| parent | 02377cf4bc6050cdbf600ce65114a5438b049763 (diff) | |
| parent | af24059fa299f1656692f5807eddd3b30b5f3cfb (diff) | |
| download | git-4682693e9ccc04252d0fad6f5627fc056abcdbba.tar.gz | |
Merge branch 'maint'v1.7.3-rc0
* maint:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&
Diffstat (limited to 't')
| -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) ' |