From d289a222d5915e9307e0e7a9a51f342942a2fe2d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Aug 2014 17:54:49 -0400 Subject: 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. --- src/wrapper.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wrapper.hs b/src/wrapper.hs index f2b39f54..f551572f 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -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 -- cgit v1.2.3