Merge branch 'tb/t5601-sed-fix' into maint

gitster · gitster · commit 86a1d147e859 · 2016-05-26T13:17:15.000-07:00
Test fix.

* tb/t5601-sed-fix:
  t5601: Remove trailing space in sed expression
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -466,7 +466,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
 #IPv6
 for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
 do
-	ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
+	ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "[]")
 	test_expect_success "clone ssh://$tuah/home/user/repo" "
 	  test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
 	"

Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '`
`466`	`466`	`#IPv6`
`467`	`467`	`for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:`
`468`	`468`	`do`
`469`		`- ehost=$(echo $tuah \| sed -e "s/1]:/1]/ "\| tr -d "[]")`
	`469`	`+ ehost=$(echo $tuah \| sed -e "s/1]:/1]/" \| tr -d "[]")`
`470`	`470`	`test_expect_success "clone ssh://$tuah/home/user/repo" "`
`471`	`471`	`test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo`
`472`	`472`	`"`