Re: [PATCH v2 00/13] push: revamp push.default

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 2, 2021, 01:16 UTC
Message-ID: <xmqqr1hlqd5v.fsf@gitster.g>
In-Reply-To: <20210531195124.218325-1-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> The end result is almost identical to v1, only the way we get there
> changes (plus there's an extra cosmetic break).

Good. The endpoint matches exactly to what was queued, with the SQUASH??? fix for the "break" thing, which is necessary to make "make sparse" happy (so it is not just "cosmetic").

IOW, this series allows us to drop the following.

commit c1964311c404afaadffd57d14d769a4051281c2b
Author: Junio C Hamano <gitster@pobox.com>
Date:   Mon May 31 12:41:06 2021 +0900

    SQUASH??? fix compilation breakage
    
    make sparse found these:
    
    builtin/push.c:221:9: error: Expected ; at end of statement
    builtin/push.c:221:9: error: got }

diff --git a/builtin/push.c b/builtin/push.c
index f1ac531252..e8b10a9b7e 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -218,6 +218,7 @@ static void setup_default_push_refspecs(struct remote *remote)
 		    "push.default is \"nothing\"."));
 		return;
 	default:
+		break;
 	}
 
 	branch = branch_get(NULL);