Re: [PATCH] merge-submodule: reduce output verbosity

Hello, Am 11. Juni 2018 um 20:04:19, Junio C Hamano (gits...@pobox.com(mailto:gits...@pobox.com)) schrieb: > Leif Middelschulte writes: > > > From: Leif Middelschulte > > > > The output shall behave more similar to ordinary file merges' output to > > prov

[PATCH] merge-submodule: reduce output verbosity

From: Leif Middelschulte The output shall behave more similar to ordinary file merges' output to provide a more consistent user experience. Signed-off-by: Leif Middelschulte --- merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge

[PATCH 1/1] merge-recursive: give notice when submodule commit gets fast-forwarded

From: Leif Middelschulte Since submodules are treated similarly to ordinary files (i.e. not as 'dumb' pointers), an automatic merge should be mentioned if the user asks for it. Just as it is mentioned for oridnary files. Signed-off-by: Leif Middelschulte --- merge-recursive.c | 10

[PATCH v4 0/1] merge-recursive: give notice when submodule commit gets fast-forwarded

From: Leif Middelschulte The provided patch is in response to Elijah Newren's [0] and Junio Hamano's [1] comments on my prior patch regarding the reasoning and implementation of a user notification during (clean) merges of submodules. [0] https://public-inbox.org/git/xmqqo9hg7554@gitster

[PATCH v3 0/1] rebased: inform about auto submodule ff

From: Leif Middelschulte <leif.middelschu...@gmail.com> This is a follow-up on Junio C Hamano's comments [0] and Stefan Beller's request [1] for a more explainatory/elaborate commit message. [0] https://public-inbox.org/git/xmqqk1s474vx@gitster-ct.c.googlers.com/ [1] https://public-inb

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

From: Leif Middelschulte <leif.middelschu...@gmail.com> 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 us

[PATCH v2 0/1] rebased: inform about auto submodule ff

From: Leif Middelschulte <leif.middelschu...@gmail.com> This is a follow-up on Junio C Hamano's comments [0] and Stefan Beller's request [1] for a more explainatory/elaborate commit message. [0] https://public-inbox.org/git/xmqqk1s474vx@gitster-ct.c.googlers.com/ [1] https://public-inb

Re: [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive

ps://public-inbox.org/git/20180514205737.21313-2-leif.middelschu...@gmail.com/ > [3] git branch-diff > origin/master..origin/sb/submodule-merge-in-merge-recursive > origin/master..HEAD >>-cover-letter.patch > > Leif Middelschulte (1): > Inform about fast-forwarding of subm

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

From: Leif Middelschulte <leif.middelschu...@gmail.com> 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: Le

[PATCH 0/1] rebased: inform about auto submodule ff during merge

From: Leif Middelschulte <leif.middelschu...@gmail.com> This patch is in response to Stefan Beller's Commit 0357af480 ("merge-recursive: i18n submodule merge output and respect verbosity", 2018-05-10) and is based on the changes it provided. Leif Middelschulte (1): Inform about

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

Hi Stefan, Am 10. Mai 2018 um 20:49:39, Stefan Beller (sbel...@google.com(mailto:sbel...@google.com)) schrieb: > On Thu, May 10, 2018 at 11:26 AM, Leif Middelschulte > wrote: > > From: Leif Middelschulte > > Hi Leif! > > thanks for following up with a patch! sure, tha

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

From: Leif Middelschulte <leif.middelschu...@gmail.com> Warn 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: Le

[PATCH 0/1] warn about auto fast-forwarded submodules during merges

From: Leif Middelschulte <leif.middelschu...@gmail.com> Warn the user during merges about automatically fast-forwarded submodules. This is just informational and does *not* change behavior otherwise. It is a follow up to Elijah Newren's suggestion[0] to provide the attached patch. [0]