apply: fall back on three-way merge

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 7d2271563016528c07b581a77ccdc63f8d98799c..d5d7105ba2debde9fa6f2f33171d84cc7c25339a 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -410,6 +410,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
        const char *receivepack = "git-receive-pack";
        int flags;
        int nonfastforward = 0;
+       int progress = -1;
 
        argv++;
        for (i = 1; i < argc; i++, argv++) {
@@ -452,6 +453,14 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                                args.verbose = 1;
                                continue;
                        }
+                       if (!strcmp(arg, "--progress")) {
+                               progress = 1;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--no-progress")) {
+                               progress = 0;
+                               continue;
+                       }
                        if (!strcmp(arg, "--thin")) {
                                args.use_thin_pack = 1;
                                continue;
@@ -492,8 +501,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                }
        }
 
-       if (!args.quiet)
-               args.progress = isatty(2);
+       if (progress == -1)
+               progress = !args.quiet && isatty(2);
+       args.progress = progress;
 
        if (args.stateless_rpc) {
                conn = NULL;