diff options
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 f7bc2b292f..235ca12455 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 6019eac918..481602d8ae 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: |