From: Damien Robert <damien.olivier.robert@gmail.com>
To: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jeff King <peff@peff.net>
Cc: Damien Robert <damien.olivier.robert+git@gmail.com>
Subject: [PATCH v6 1/2] remote.c: fix %(push) for triangular workflows
Date: Mon, 6 Apr 2020 19:56:47 +0200 [thread overview]
Message-ID: <20200406175648.25737-2-damien.olivier.robert+git@gmail.com> (raw)
In-Reply-To: <20200406175648.25737-1-damien.olivier.robert+git@gmail.com>
The behaviour of `git push` when push.default is simple or upstream
changes in a triangular workflow, but this was not taken into account by
%(push). Update the code to detect triangular workflows and fix this.
Signed-off-by: Damien Robert <damien.olivier.robert+git@gmail.com>
---
remote.c | 42 +++++++++++++++++++++++++++++++-----------
1 file changed, 31 insertions(+), 11 deletions(-)
diff --git a/remote.c b/remote.c
index c43196ec06..3750a2bcc1 100644
--- a/remote.c
+++ b/remote.c
@@ -1656,6 +1656,18 @@ static const char *tracking_for_push_dest(struct remote *remote,
return ret;
}
+static int is_workflow_triangular(struct branch *branch)
+{
+ struct remote *fetch_remote = remote_get(remote_for_branch(branch, NULL));
+ struct remote *push_remote = remote_get(pushremote_for_branch(branch, NULL));
+ return (fetch_remote && push_remote && fetch_remote != push_remote);
+}
+
+/**
+ * Return the tracking branch, as in %(push), that corresponds to the ref we
+ * would push to given a bare `git push` while `branch` is checked out.
+ * See also branch_get_push_remoteref above.
+ */
static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
{
struct remote *remote;
@@ -1693,23 +1705,31 @@ static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
return tracking_for_push_dest(remote, branch->refname, err);
case PUSH_DEFAULT_UPSTREAM:
- return branch_get_upstream(branch, err);
+ if (is_workflow_triangular(branch))
+ return error_buf(err, _("push has no destination (push.default is 'upstream' and we are in a triangular workflow)"));
+ else
+ return branch_get_upstream(branch, err);
case PUSH_DEFAULT_UNSPECIFIED:
case PUSH_DEFAULT_SIMPLE:
{
const char *up, *cur;
- up = branch_get_upstream(branch, err);
- if (!up)
- return NULL;
- cur = tracking_for_push_dest(remote, branch->refname, err);
- if (!cur)
- return NULL;
- if (strcmp(cur, up))
- return error_buf(err,
- _("cannot resolve 'simple' push to a single destination"));
- return cur;
+ if (is_workflow_triangular(branch)) {
+ return tracking_for_push_dest(remote, branch->refname, err);
+ }
+ else {
+ up = branch_get_upstream(branch, err);
+ if (!up)
+ return NULL;
+ cur = tracking_for_push_dest(remote, branch->refname, err);
+ if (!cur)
+ return NULL;
+ if (strcmp(cur, up))
+ return error_buf(err,
+ _("cannot resolve 'simple' push to a single destination"));
+ return cur;
+ }
}
}
--
Patched on top of v2.26.0-106-g9fadedd637 (git version 2.26.0)
next prev parent reply other threads:[~2020-04-06 17:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 17:24 [PATCH 1/1] remote.c: fix handling of push:remote_ref Damien Robert
2020-02-28 18:23 ` Jeff King
2020-03-01 22:05 ` Damien Robert
2020-03-02 13:32 ` Jeff King
2020-03-03 16:12 ` [PATCH v2 0/2] Damien Robert
2020-03-03 16:12 ` [PATCH v2 1/2] remote: drop "explicit" parameter from remote_ref_for_branch() Damien Robert
2020-03-03 17:51 ` Junio C Hamano
2020-03-03 21:11 ` Jeff King
2020-03-03 22:22 ` Junio C Hamano
2020-03-03 16:12 ` [PATCH v2 2/2] remote.c: fix handling of %(push:remoteref) Damien Robert
2020-03-03 16:29 ` Damien Robert
2020-03-03 18:29 ` Junio C Hamano
2020-03-03 18:21 ` Junio C Hamano
2020-03-03 22:24 ` Damien Robert
2020-03-03 22:48 ` Junio C Hamano
2020-03-12 16:45 ` [PATCH v3 1/1] " Damien Robert
2020-03-25 22:16 ` Damien Robert
2020-03-27 22:08 ` Junio C Hamano
2020-03-28 22:25 ` Damien Robert
2020-03-28 13:15 ` Jeff King
2020-03-28 13:31 ` Jeff King
2020-04-16 15:12 ` Damien Robert
2020-04-06 16:04 ` Damien Robert
2020-04-06 21:46 ` Jeff King
2020-04-06 17:56 ` [RFC PATCH v4 0/2] %(push) and %(push:remoteref) bug fixes Damien Robert
2020-04-06 17:56 ` Damien Robert [this message]
2020-04-06 17:56 ` [PATCH v6 2/2] remote.c: fix handling of %(push:remoteref) Damien Robert
2020-04-16 15:03 ` [PATCH v8 1/1] " Damien Robert
2020-04-16 15:21 ` Damien Robert
2020-09-03 22:01 ` Junio C Hamano
2020-09-11 21:43 ` Damien Robert
2020-09-14 22:21 ` Junio C Hamano
2020-03-03 16:16 ` [PATCH 1/1] remote.c: fix handling of push:remote_ref Damien Robert
2020-03-02 13:48 ` Jeff King
2020-03-03 16:25 ` Damien Robert
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200406175648.25737-2-damien.olivier.robert+git@gmail.com \
--to=damien.olivier.robert@gmail.com \
--cc=damien.olivier.robert+git@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).