Fix bug where date and author were not found in merge commits

4c0630ec2a943d540dde8716e2a075a4a140d8b0

tucker <tucker@pangolin.lan> | Sun Sep 28 2025

Fix bug where date and author were not found in merge commits

The line that starts with "merge" was not expected, and it threw
off the line numbers that I was expecting before.
src/vcses/git/operations.ts:54
Before
53
54
55



56


57


58
59
      gitLogSubset = gitLogSubset.slice(nextPatchStart)

      const hash = currentPatch[0].replace("commit ", "").trim()
⁣
⁣
⁣
      const author = currentPatch[1].replace("Author: ", "").trim()
⁣
⁣
      const date = currentPatch[2].replace("Date: ", "").trim()
⁣
⁣
      const diffStart = currentPatch.findIndex((line) => {
        return line.startsWith("diff ")
      })
After
53
54
55
56
57
58
59
60
61
62
63
64
65
66
      gitLogSubset = gitLogSubset.slice(nextPatchStart)

      const hash = currentPatch[0].replace("commit ", "").trim()
      let author, date
      [1, 2, 3].forEach((lineNumber) => {
        if (currentPatch[lineNumber].startsWith("Author")) {
          author = currentPatch[lineNumber].replace("Author: ", "").trim()
        }
        else if (currentPatch[lineNumber].startsWith("Date")) {
          date = currentPatch[lineNumber].replace("Date: ", "").trim()
        }
      })
      const diffStart = currentPatch.findIndex((line) => {
        return line.startsWith("diff ")
      })