Merge branch 'ks/branch-set-upstream'

gitster · gitster · commit 4229478639c1 · 2018-06-18T11:23:23.000-07:00
A test title has been reworded to clarify it.

* ks/branch-set-upstream:
  t3200: clarify description of --set-upstream test
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
@@ -885,7 +885,7 @@ test_expect_success 'test --unset-upstream on a particular branch' '
 	test_must_fail git config branch.my14.merge
 '
 
-test_expect_success '--set-upstream fails' '
+test_expect_success 'disabled option --set-upstream fails' '
     test_must_fail git branch --set-upstream origin/master
 '
 

Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ test_expect_success 'test --unset-upstream on a particular branch' '`
`885`	`885`	`test_must_fail git config branch.my14.merge`
`886`	`886`	`'`
`887`	`887`
`888`		`-test_expect_success '--set-upstream fails' '`
	`888`	`+test_expect_success 'disabled option --set-upstream fails' '`
`889`	`889`	`test_must_fail git branch --set-upstream origin/master`
`890`	`890`	`'`
`891`	`891`