cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Joey Hess 2014-08-19 17:54:49 -04:00
parent adf8b2ec34
commit d289a222d5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wrapper.hs
View File

@ -125,9 +125,7 @@ setupupstreammaster newref propellordir = do
changeWorkingDirectory tmprepo changeWorkingDirectory tmprepo
git ["fetch", distrepo, "--quiet"] git ["fetch", distrepo, "--quiet"]
git ["reset", "--hard", oldref, "--quiet"] git ["reset", "--hard", oldref, "--quiet"]
run "sh" ["-c", "git diff .." ++ newref ++ " | git apply --whitespace=nowarn"] git ["merge", newref, "--quiet", "-m", "merging upstream version"]
git ["commit", "-a", "-m", "merging upstream into master", "--quiet"]
git ["merge", newref, "--quiet", "-m", "merging upstream release"]
fetchUpstreamBranch propellordir tmprepo fetchUpstreamBranch propellordir tmprepo
cleantmprepo cleantmprepo