checkout: tone down the "forked status" diagnostic messages

diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index 3aab89ca1bb9202232448f16e44e939bff4c820d..8afb1d0bca0635dc22f658455477d9fada231290 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -298,52 +298,65 @@ static void print_ok_ref_status(struct ref *ref)
        }
 }
 
+static int print_one_push_status(struct ref *ref, const char *dest, int count)
+{
+       if (!count)
+               fprintf(stderr, "To %s\n", dest);
+
+       switch(ref->status) {
+       case REF_STATUS_NONE:
+               print_ref_status('X', "[no match]", ref, NULL, NULL);
+               break;
+       case REF_STATUS_REJECT_NODELETE:
+               print_ref_status('!', "[rejected]", ref, NULL,
+                               "remote does not support deleting refs");
+               break;
+       case REF_STATUS_UPTODATE:
+               print_ref_status('=', "[up to date]", ref,
+                               ref->peer_ref, NULL);
+               break;
+       case REF_STATUS_REJECT_NONFASTFORWARD:
+               print_ref_status('!', "[rejected]", ref, ref->peer_ref,
+                               "non-fast forward");
+               break;
+       case REF_STATUS_REMOTE_REJECT:
+               print_ref_status('!', "[remote rejected]", ref,
+                               ref->deletion ? NULL : ref->peer_ref,
+                               ref->remote_status);
+               break;
+       case REF_STATUS_EXPECTING_REPORT:
+               print_ref_status('!', "[remote failure]", ref,
+                               ref->deletion ? NULL : ref->peer_ref,
+                               "remote failed to report status");
+               break;
+       case REF_STATUS_OK:
+               print_ok_ref_status(ref);
+               break;
+       }
+
+       return 1;
+}
+
 static void print_push_status(const char *dest, struct ref *refs)
 {
        struct ref *ref;
-       int shown_dest = 0;
+       int n = 0;
 
-       for (ref = refs; ref; ref = ref->next) {
-               if (!ref->status)
-                       continue;
-               if (ref->status == REF_STATUS_UPTODATE && !args.verbose)
-                       continue;
+       if (args.verbose) {
+               for (ref = refs; ref; ref = ref->next)
+                       if (ref->status == REF_STATUS_UPTODATE)
+                               n += print_one_push_status(ref, dest, n);
+       }
 
-               if (!shown_dest) {
-                       fprintf(stderr, "To %s\n", dest);
-                       shown_dest = 1;
-               }
+       for (ref = refs; ref; ref = ref->next)
+               if (ref->status == REF_STATUS_OK)
+                       n += print_one_push_status(ref, dest, n);
 
-               switch(ref->status) {
-               case REF_STATUS_NONE:
-                       print_ref_status('X', "[no match]", ref, NULL, NULL);
-                       break;
-               case REF_STATUS_REJECT_NODELETE:
-                       print_ref_status('!', "[rejected]", ref, NULL,
-                                       "remote does not support deleting refs");
-                       break;
-               case REF_STATUS_UPTODATE:
-                       print_ref_status('=', "[up to date]", ref,
-                                       ref->peer_ref, NULL);
-                       break;
-               case REF_STATUS_REJECT_NONFASTFORWARD:
-                       print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-                                       "non-fast forward");
-                       break;
-               case REF_STATUS_REMOTE_REJECT:
-                       print_ref_status('!', "[remote rejected]", ref,
-                                       ref->deletion ? NULL : ref->peer_ref,
-                                       ref->remote_status);
-                       break;
-               case REF_STATUS_EXPECTING_REPORT:
-                       print_ref_status('!', "[remote failure]", ref,
-                                       ref->deletion ? NULL : ref->peer_ref,
-                                       "remote failed to report status");
-                       break;
-               case REF_STATUS_OK:
-                       print_ok_ref_status(ref);
-                       break;
-               }
+       for (ref = refs; ref; ref = ref->next) {
+               if (ref->status != REF_STATUS_NONE &&
+                   ref->status != REF_STATUS_UPTODATE &&
+                   ref->status != REF_STATUS_OK)
+                       n += print_one_push_status(ref, dest, n);
        }
 }
 
@@ -528,10 +541,12 @@ static void verify_remote_names(int nr_heads, const char **heads)
                remote = remote ? (remote + 1) : heads[i];
                switch (check_ref_format(remote)) {
                case 0: /* ok */
-               case -2: /* ok but a single level -- that is fine for
-                         * a match pattern.
-                         */
-               case -3: /* ok but ends with a pattern-match character */
+               case CHECK_REF_FORMAT_ONELEVEL:
+                       /* ok but a single level -- that is fine for
+                        * a match pattern.
+                        */
+               case CHECK_REF_FORMAT_WILDCARD:
+                       /* ok but ends with a pattern-match character */
                        continue;
                }
                die("remote part of refspec is not a valid name in %s",