Merge branch 'maint'

* maint:
  t1402: work around shell quoting issue on NetBSD
  remote-hg: Fix biridectionality -> bidirectionality typos
This commit is contained in:
Junio C Hamano
2013-01-08 13:23:46 -08:00
3 changed files with 6 additions and 4 deletions

View File

@ -11,7 +11,8 @@ valid_ref() {
prereq=$1
shift
esac
test_expect_success $prereq "ref name '$1' is valid${2:+ with options $2}" "
desc="ref name '$1' is valid${2:+ with options $2}"
test_expect_success $prereq "$desc" "
git check-ref-format $2 '$1'
"
}
@ -22,7 +23,8 @@ invalid_ref() {
prereq=$1
shift
esac
test_expect_success $prereq "ref name '$1' is invalid${2:+ with options $2}" "
desc="ref name '$1' is invalid${2:+ with options $2}"
test_expect_success $prereq "$desc" "
test_must_fail git check-ref-format $2 '$1'
"
}