diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:55:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:55:37 -0400 |
| commit | c0cc5d214bb9fc609c9f90cc1a024baef43853fa (patch) | |
| tree | 97b44d0663733d718c6a8247cee5295fc15cac16 | |
| parent | 4634f3cf4767d93c910bddec4769e16a95e935e8 (diff) | |
| parent | d289a222d5915e9307e0e7a9a51f342942a2fe2d (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/wrapper.hs | 4 |
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 cleantmprepo |