Workaround for rebase-merged commits/branches

[katrinleinweber]

Might this be solvable ...

guldkorn/main.go

Lines 215 to 222 in 113db2c

	// For example:
	//
	// status: "diverged" (head=baosen:master vs base=diasurgical:master)
	// baosen:master ahead 1 (and behind 1022) of diasurgical:master
	// https://github.com/baosen/devilutionX/commits/master?author=baosen
	//
	// Commit `219241d8064c3610a594f0b152ac66da7d38ae46` gets the new hash
	// `c6d5dc48ffd45310e4b52c93506b1b04f713505e` after rebase.

... by checking the origin's commit list for a commit with matching author AND a different committer or for the same message?

I tried the rather dirty git-based way just now, but this didn't work:

1. git clone --depth=1 ORIGIN_URL
2. git remote add $forkRepoName FORK_URL
3. git fetch --depth=1 $forkRepoName $forkBranchName
4. Then, git diff --exit-code$defaultBranch $forkRepoName/$forkBranchName didn't produce 0 because later changes on $defaultBranch caused a new diff.

[mewmew]

Might this be solvable ...
... by checking the origin's commit list for a commit with matching author AND a different committer or for the same message?

Hi Katrin,

Yeah, the approach you mentioned may be "good enough". If we are checking the individual commits, we may also want to check if the contents diff is indeed identical too, and not rely solely on the commit message.

Cheers,
Robin