simpler merge
Ah, we've checked out the oldref, so can just merge the newref in and get a branch that is suitable for mergeing into the user's repo. No need for manual diff, which can fail on eg, binaries or no changes.
This commit is contained in:
parent
adf8b2ec34
commit
d289a222d5
|
@ -125,9 +125,7 @@ setupupstreammaster newref propellordir = do
|
|||
changeWorkingDirectory tmprepo
|
||||
git ["fetch", distrepo, "--quiet"]
|
||||
git ["reset", "--hard", oldref, "--quiet"]
|
||||
run "sh" ["-c", "git diff .." ++ newref ++ " | git apply --whitespace=nowarn"]
|
||||
git ["commit", "-a", "-m", "merging upstream into master", "--quiet"]
|
||||
git ["merge", newref, "--quiet", "-m", "merging upstream release"]
|
||||
git ["merge", newref, "--quiet", "-m", "merging upstream version"]
|
||||
|
||||
fetchUpstreamBranch propellordir tmprepo
|
||||
cleantmprepo
|
||||
|
|
Loading…
Reference in New Issue