Merge branch 'sd/t3200-typofix' into maint

gitster · gitster · commit e06b421cf09c · 2017-06-05T09:03:22.000+09:00
Test fix.

* sd/t3200-typofix:
  branch test: fix invalid config key access
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
@@ -338,7 +338,7 @@ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
 
 test_expect_success 'config information was renamed, too' '
 	test $(git config branch.s.dummy) = Hello &&
-	test_must_fail git config branch.s/s/dummy
+	test_must_fail git config branch.s/s.dummy
 '
 
 test_expect_success 'deleting a symref' '

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '`
`338`	`338`
`339`	`339`	`test_expect_success 'config information was renamed, too' '`
`340`	`340`	`test $(git config branch.s.dummy) = Hello &&`
`341`		`- test_must_fail git config branch.s/s/dummy`
	`341`	`+ test_must_fail git config branch.s/s.dummy`
`342`	`342`	`'`
`343`	`343`
`344`	`344`	`test_expect_success 'deleting a symref' '`