Re: [PATCH] merge: allow fast-forward when merging a tracked tag

Eric Sunshine writes: >> + tag_ref = xstrfmt("refs/tags/%s", >> + ((struct tag >> *)merge_remote_util(commit)->obj)->tag); > > xstrfmt() allocates a new string... > >> + if (!read_ref(tag_ref, ) && >> + !oidcmp(,

Re: [PATCH] merge: allow fast-forward when merging a tracked tag

On Thu, Feb 15, 2018 at 5:45 PM, Junio C Hamano 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

[PATCH] merge: allow fast-forward when merging a tracked tag

Long time ago at fab47d05 ("merge: force edit and no-ff mode when merging a tag object", 2011-11-07), "git merge" was made to always create a merge commit when merging a tag, even when the side branch being merged is a descendant of the current branch. This default is good for merges made by