Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

Elijah Newren writes: > Thanks for continuing to push on this. This looks good so far (to > me), but I was also hoping to see the analogy between these messages > and "Auto-merging $FILE" for regular files mentioned. Both Junio[1] > and I[2] pointed out this similarity, and I

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

Hi Leif, On Fri, May 18, 2018 at 12:48 PM, Leif Middelschulte wrote: > From: Leif Middelschulte > > Silent fast-forwarding might lead to inconveniences in cases where > submodules are expected to have a certain revision, because 'more

[PATCH 1/1] Inform about fast-forwarding of submodules during merge

From: Leif Middelschulte Silent fast-forwarding might lead to inconveniences in cases where submodules are expected to have a certain revision, because 'more recent' (therefore fast-forwardable) versions might break behavior/contain regressions. A use-case is the

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

Elijah Newren writes: > Hi Leif, > > On Mon, May 14, 2018 at 1:57 PM, Leif Middelschulte > wrote: > > Thanks for updating the patch on top of Stefan's series. :-) > >> /* Case #1: a is contained in b or vice versa */ >> if

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

Hi Leif, On Mon, May 14, 2018 at 1:57 PM, Leif Middelschulte wrote: Thanks for updating the patch on top of Stefan's series. :-) > /* Case #1: a is contained in b or vice versa */ > if (in_merge_bases(commit_a, commit_b)) { >

Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge

On Mon, May 14, 2018 at 1:57 PM, Leif Middelschulte wrote: > From: Leif Middelschulte > > Inform the user about an automatically fast-forwarded submodule. The silent > merge > behavior was introduced by commit 68d03e4a6e44 ("Implement

[PATCH 1/1] Inform about fast-forwarding of submodules during merge

From: Leif Middelschulte Inform the user about an automatically fast-forwarded submodule. The silent merge behavior was introduced by commit 68d03e4a6e44 ("Implement automatic fast-forward merge for submodules", 2010-07-07)). Signed-off-by: Leif Middelschulte