diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:34 -0700 |
| commit | 71076e11cda645c08f5c9f269e02ed28e47d5c4a (patch) | |
| tree | 4f573cff90d0f20a754dffefc1399b40d36b5d55 | |
| parent | 880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf (diff) | |
| parent | 68f3c079fe87caab2e116fd9a48bbdedc54be026 (diff) | |
| download | git-71076e11cda645c08f5c9f269e02ed28e47d5c4a.tar.gz git-71076e11cda645c08f5c9f269e02ed28e47d5c4a.tar.xz | |
Merge branch 'jk/push-scrub-url' into maint
"git fetch http://user:pass@host/repo..." scrubbed the userinfo
part, but "git push" didn't.
* jk/push-scrub-url:
t5541: fix url scrubbing test when GPG is not set
push: anonymize URL in status output
| -rwxr-xr-x | t/t5541-http-push-smart.sh | 9 | ||||
| -rw-r--r-- | transport.c | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index fd7d06b9a..9593fc17f 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -368,5 +368,14 @@ test_expect_success GPG 'push with post-receive to inspect certificate' ' test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH/push-cert-status" ' +test_expect_success 'push status output scrubs password' ' + 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 +' + stop_httpd test_done diff --git a/transport.c b/transport.c index 095e61f0a..be4a63ec1 100644 --- a/transport.c +++ b/transport.c @@ -359,8 +359,11 @@ static void print_ok_ref_status(struct ref *ref, int porcelain) static int print_one_push_status(struct ref *ref, const char *dest, int count, int porcelain) { - if (!count) - fprintf(porcelain ? stdout : stderr, "To %s\n", dest); + if (!count) { + char *url = transport_anonymize_url(dest); + fprintf(porcelain ? stdout : stderr, "To %s\n", url); + free(url); + } switch(ref->status) { case REF_STATUS_NONE: |