diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-15 00:58:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-15 00:58:24 -0700 |
| commit | 66bce02ec459123d07c3f0230906cc2f8e36504c (patch) | |
| tree | 53a1699e3cb68ef7483c98bd28cc85e5d3c76738 /builtin | |
| parent | 2949151fe9d92b2c3405f188e650d9bb7b46c663 (diff) | |
| parent | c296134d038fe6d836fe3848e0b342d920933683 (diff) | |
| download | git-66bce02ec459123d07c3f0230906cc2f8e36504c.tar.gz git-66bce02ec459123d07c3f0230906cc2f8e36504c.tar.xz | |
Merge branch 'ld/push-porcelain'
* ld/push-porcelain:
t5516: Use test_cmp when appropriate
git-push: add tests for git push --porcelain
git-push: make git push --porcelain print "Done"
git-push: send "To <remoteurl>" messages to the standard output in --porcelain mode
git-push: fix an advice message so it goes to stderr
Conflicts:
transport.c
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 6 | ||||
| -rw-r--r-- | builtin/send-pack.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/builtin/push.c b/builtin/push.c index f7bc2b292..235ca1245 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -124,9 +124,9 @@ static int push_with_options(struct transport *transport, int flags) return 0; if (nonfastforward && advice_push_nonfastforward) { - printf("To prevent you from losing history, non-fast-forward updates were rejected\n" - "Merge the remote changes before pushing again. See the 'Note about\n" - "fast-forwards' section of 'git push --help' for details.\n"); + fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n" + "Merge the remote changes before pushing again. See the 'Note about\n" + "fast-forwards' section of 'git push --help' for details.\n"); } return 1; diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 6019eac91..481602d8a 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -361,6 +361,10 @@ int send_pack(struct send_pack_args *args, if (ret < 0) return ret; + + if (args->porcelain) + return 0; + for (ref = remote_refs; ref; ref = ref->next) { switch (ref->status) { case REF_STATUS_NONE: |