Merge branch 'jk/push-scrub-url' into next

gitster · gitster · commit 22bb7eda9b71 · 2016-07-20T15:49:25.000-07:00
* jk/push-scrub-url:
  t5541: fix url scrubbing test when GPG is not set
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
@@ -369,8 +369,10 @@ test_expect_success GPG 'push with post-receive to inspect certificate' '
 '
 
 test_expect_success 'push status output scrubs password' '
-	test_commit scrub &&
-	git push --porcelain "$HTTPD_URL_USER_PASS/smart/test_repo.git" >status &&
+	cd "$ROOT_PATH/test_repo_clone" &&
+	git push --porcelain \
+		"$HTTPD_URL_USER_PASS/smart/test_repo.git" \
+		+HEAD:scrub >status &&
 	# should have been scrubbed down to vanilla URL
 	grep "^To $HTTPD_URL/smart/test_repo.git" status
 '

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,10 @@ test_expect_success GPG 'push with post-receive to inspect certificate' '`
`369`	`369`	`'`
`370`	`370`
`371`	`371`	`test_expect_success 'push status output scrubs password' '`
`372`		`- test_commit scrub &&`
`373`		`- git push --porcelain "$HTTPD_URL_USER_PASS/smart/test_repo.git" >status &&`
	`372`	`+ cd "$ROOT_PATH/test_repo_clone" &&`
	`373`	`+ git push --porcelain \`
	`374`	`+ "$HTTPD_URL_USER_PASS/smart/test_repo.git" \`
	`375`	`+ +HEAD:scrub >status &&`
`374`	`376`	`# should have been scrubbed down to vanilla URL`
`375`	`377`	`grep "^To $HTTPD_URL/smart/test_repo.git" status`
`376`	`378`	`'`