From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] merge: allow fast-forward when merging a tracked tag
Date: Thu, 15 Feb 2018 18:34:19 -0500 [thread overview]
Message-ID: <CAPig+cSJKDH=_-hGZLpZUjC4WEyjMRAd2VPgo-Vd+sHpa4jQ-Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqy3jt7ty8.fsf_-_@gitster-ct.c.googlers.com>
On Thu, Feb 15, 2018 at 5:45 PM, Junio C Hamano <gitster@pobox.com> wrote:
> [...]
> Update the default (again) for "git merge" that merges a tag object
> to (1) --no-ff (i.e. create a merge commit even when side branch
> fast forwards) if the tag being merged is not at its expected place
> in refs/tags/ hierarchy and (2) --ff (i.e. allow fast-forward update
> when able) otherwise.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> diff --git a/builtin/merge.c b/builtin/merge.c
> @@ -1125,6 +1126,42 @@ static struct commit_list *collect_parents(struct commit *head_commit,
> +static int merging_a_throwaway_tag(struct commit *commit)
> +{
> + const char *tag_ref;
> + struct object_id oid;
> +
> + /* Are we merging a tag? */
> + if (!merge_remote_util(commit) ||
> + !merge_remote_util(commit)->obj ||
> + merge_remote_util(commit)->obj->type != OBJ_TAG)
> + return 0;
> +
> + /*
> + * Now we know we are merging a tag object. Are we downstream
> + * and following the tags from upstream? If so, we must have
> + * the tag object pointed at by "refs/tags/$T" where $T is the
> + * tagname recorded in the tag object. We want to allow such
> + * a "just to catch up" merge to fast-forward.
> + */
> + tag_ref = xstrfmt("refs/tags/%s",
> + ((struct tag *)merge_remote_util(commit)->obj)->tag);
xstrfmt() allocates a new string...
> + if (!read_ref(tag_ref, &oid) &&
> + !oidcmp(&oid, &merge_remote_util(commit)->obj->oid))
> + return 0;
...which is leaked here...
> +
> + /*
> + * Otherwise, we are playing an integrator's role, making a
> + * merge with a throw-away tag from a contributor with
> + * something like "git pull $contributor $signed_tag".
> + * We want to forbid such a merge from fast-forwarding
> + * by default; otherwise we would not keep the signature
> + * anywhere.
> + */
> + return 1;
...and here.
> +}
next prev parent reply other threads:[~2018-02-15 23:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180213080036.3bf3a908@canb.auug.org.au>
2018-02-12 21:15 ` linux-next: unnecessary merge in the v4l-dvb tree Linus Torvalds
2018-02-12 21:36 ` Mauro Carvalho Chehab
2018-02-12 21:37 ` Linus Torvalds
2018-02-12 21:44 ` Junio C Hamano
2018-02-12 21:59 ` Linus Torvalds
2018-02-12 23:42 ` Junio C Hamano
2018-02-13 0:21 ` Mauro Carvalho Chehab
2018-02-13 17:18 ` Junio C Hamano
2018-02-13 17:33 ` Linus Torvalds
2018-02-14 18:12 ` Junio C Hamano
2018-02-15 22:45 ` [PATCH] merge: allow fast-forward when merging a tracked tag Junio C Hamano
2018-02-15 23:34 ` Eric Sunshine [this message]
2018-02-16 18:06 ` Junio C Hamano
2018-02-16 21:27 ` [PATCH v2] " Junio C Hamano
2018-02-12 21:37 ` linux-next: unnecessary merge in the v4l-dvb tree Junio C Hamano
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='CAPig+cSJKDH=_-hGZLpZUjC4WEyjMRAd2VPgo-Vd+sHpa4jQ-Q@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mchehab@osg.samsung.com \
--cc=torvalds@linux-foundation.org \
/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).