On Mon, Jul 18, 2022 at 11:45 AM Martin Ågren <martin.agren@xxxxxxxxx> wrote: > While setting up an unresolved merge for `git rerere`, we run `git > rev-parse` and `git fmt-merge-msg` to create a variable `$fifth` and a > commit-message file `msg`, which we then never actually use. This has > been like that since these tests were added in 672d1b789b ("rerere: > migrate to parse-options API", 2010-08-05). This does exercise `git > rev-parse` and `git fmt-merge-msg`, but doesn't contribute to testing > `git rerere`. Drop these lines. > > Reported-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> > Signed-off-by: Martin Ågren <martin.agren@xxxxxxxxx> > --- > This is quite late fallout from Eric's review [1] of some commits that > have already gone in. > > [1] https://lore.kernel.org/git/CAPig+cSjHg2-WYqdkZAS0ye1goj_=5RN3mdjt0-4kSBqNm6WLg@xxxxxxxxxxxxxx/ Thanks for following up on this. The patch looks fine.