On Wed, Sep 7, 2022 at 3:36 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > > > Hi Matheus > > > > Thanks for working on this, having a warning for this is a useful > > addition. If the user embeds a diff in their commit message then they > > will receive three warnings > > > > warning: commit message has a patch delimiter: 'diff --git a/file b/file' > > warning: commit message has a patch delimiter: '--- file' > > warning: git am might fail to apply this patch. Consider indenting the > > offending lines. > > > > I guess it's helpful to show all the lines that are considered > > delimiters but it gets quite noisy. Hmm, right :/ Perhaps we could avoid repeating the warning message: warning: commit message has a patch delimiter(s): diff --git a/file b/file --- file .... warning: git am might fail to apply this patch. > True. I wonder if automatically indenting these lines is an option ;-) Makes sense. Perhaps under a config option? The difficult part would be for the scissors; just indenting it with whitespaces wouldn't suffice, right?
