From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Elijah Newren" <newren@gmail.com>,
"Brandon Williams" <bwilliams.eng@gmail.com>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH v2 00/13] push: revamp push.default
Date: Wed, 02 Jun 2021 10:16:12 +0900 [thread overview]
Message-ID: <xmqqr1hlqd5v.fsf@gitster.g> (raw)
In-Reply-To: <20210531195124.218325-1-felipe.contreras@gmail.com> (Felipe Contreras's message of "Mon, 31 May 2021 14:51:11 -0500")
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);
next prev parent reply other threads:[~2021-06-02 1:16 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 19:32 [PATCH v3 0/7] Unconvolutize push.default=simple Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 1/7] push: rename !triangular to same_remote Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 2/7] push: hedge code of default=simple Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 3/7] push: copy code to setup_push_simple() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 4/7] push: reorganize setup_push_simple() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 5/7] push: simplify setup_push_simple() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 6/7] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 7/7] doc: push: explain default=simple correctly Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 00/13] push: revamp push.default Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 01/13] push: create new get_upstream_ref() helper Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 02/13] push: return immediately in trivial switch case Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 03/13] push: split switch cases Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 04/13] push: factor out null branch check Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 05/13] push: only get the branch when needed Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 06/13] push: make setup_push_* return the dst Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 07/13] push: trivial simplifications Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 08/13] push: get rid of all the setup_push_* functions Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 09/13] push: factor out the typical case Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 10/13] push: remove redundant check Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 11/13] push: remove trivial function Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 12/13] push: only check same_remote when needed Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 13/13] push: don't get a full remote object Felipe Contreras
2021-06-02 1:16 ` Junio C Hamano [this message]
2021-06-02 4:05 ` [PATCH v2 00/13] push: revamp push.default Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr1hlqd5v.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=bwilliams.eng@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).