path: root/src
diff options
authorJoey Hess2014-08-19 17:54:49 -0400
committerJoey Hess2014-08-19 17:54:49 -0400
commitd289a222d5915e9307e0e7a9a51f342942a2fe2d (patch)
treea3fb1e70ba76ea98d97c2f5e4435ce1ccd090861 /src
parentadf8b2ec34d5daec0eb3b060681cce6eceb6238d (diff)
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.
Diffstat (limited to 'src')
1 files changed, 1 insertions, 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