Merge branch 'maint'

gitster · gitster · commit 414c78ccff47 · 2013-01-08T13:23:46.000-08:00
* maint:
  t1402: work around shell quoting issue on NetBSD
  remote-hg: Fix biridectionality -&gt; bidirectionality typos
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
@@ -31,7 +31,7 @@ import urllib
 # hg:
 # Emulate hg-git.
 # Only hg bookmarks are exported as git branches.
-# Commits are modified to preserve hg information and allow biridectionality.
+# Commits are modified to preserve hg information and allow bidirectionality.
 #
 
 NAME_RE = re.compile('^([^<>]+)')
diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh
@@ -6,7 +6,7 @@
 # https://bitbucket.org/durin42/hg-git/src
 #
 
-test_description='Test biridectionality of remote-hg'
+test_description='Test bidirectionality of remote-hg'
 
 . ./test-lib.sh
 
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
@@ -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'
 	"
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import urllib`
`31`	`31`	`# hg:`
`32`	`32`	`# Emulate hg-git.`
`33`	`33`	`# Only hg bookmarks are exported as git branches.`
`34`		`-# Commits are modified to preserve hg information and allow biridectionality.`
	`34`	`+# Commits are modified to preserve hg information and allow bidirectionality.`
`35`	`35`	`#`
`36`	`36`
`37`	`37`	`NAME_RE = re.compile('^([^<>]+)')`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# https://bitbucket.org/durin42/hg-git/src`
`7`	`7`	`#`
`8`	`8`
`9`		`-test_description='Test biridectionality of remote-hg'`
	`9`	`+test_description='Test bidirectionality of remote-hg'`
`10`	`10`
`11`	`11`	`. ./test-lib.sh`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ valid_ref() {`
`11`	`11`	`prereq=$1`
`12`	`12`	`shift`
`13`	`13`	`esac`
`14`		`- test_expect_success $prereq "ref name '$1' is valid${2:+ with options $2}" "`
	`14`	`+ desc="ref name '$1' is valid${2:+ with options $2}"`
	`15`	`+ test_expect_success $prereq "$desc" "`
`15`	`16`	`git check-ref-format $2 '$1'`
`16`	`17`	`"`
`17`	`18`	`}`
`@@ -22,7 +23,8 @@ invalid_ref() {`
`22`	`23`	`prereq=$1`
`23`	`24`	`shift`
`24`	`25`	`esac`
`25`		`- test_expect_success $prereq "ref name '$1' is invalid${2:+ with options $2}" "`
	`26`	`+ desc="ref name '$1' is invalid${2:+ with options $2}"`
	`27`	`+ test_expect_success $prereq "$desc" "`
`26`	`28`	`test_must_fail git check-ref-format $2 '$1'`
`27`	`29`	`"`
`28`	`30`	`}`