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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 17:51:43 -04:00
parent 845877a44a adf8b2ec34
commit 4634f3cf47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wrapper.hs
View File

@ -103,7 +103,7 @@ wrapper args propellordir propellorbin = do
-- in lots of merge conflicts, since git cannot find a common parent -- in lots of merge conflicts, since git cannot find a common parent
-- commit. -- commit.
-- --
-- Instead, the upstream/master branch is created by taking the previous -- Instead, the upstream/master branch is created by taking the
-- upstream/master branch (which must be an old version of propellor, -- upstream/master branch (which must be an old version of propellor,
-- as distributed), and diffing from it to the current origin/master, -- as distributed), and diffing from it to the current origin/master,
-- and committing the result. This is done in a temporary clone of the -- and committing the result. This is done in a temporary clone of the
@ -126,7 +126,8 @@ setupupstreammaster newref propellordir = do
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"] run "sh" ["-c", "git diff .." ++ newref ++ " | git apply --whitespace=nowarn"]
git ["commit", "-a", "-m", "merging upstream changes", "--quiet"] 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