Merge branch 'jk/push-scrub-url'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:43 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jul 2016 21:13:43 +0000 (14:13 -0700)
"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

1  2 
t/t5541-http-push-smart.sh
transport.c

Simple merge
diff --cc transport.c
Simple merge