Merge branch 'maint'

* maint:
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &&
This commit is contained in:
Junio C Hamano
2010-09-06 00:12:04 -07:00
3 changed files with 11 additions and 11 deletions

View File

@ -435,7 +435,7 @@ test_expect_success 'update --prune' '
git branch -m side2 side3) && git branch -m side2 side3) &&
(cd test && (cd test &&
git remote update --prune && 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 && git rev-parse refs/remotes/origin/side3 &&
test_must_fail git rev-parse refs/remotes/origin/side2) test_must_fail git rev-parse refs/remotes/origin/side2)
' '