diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 07:32:18 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 07:32:18 -0700 |
| commit | fd94b0e23e3fc429a1d12762f86c08aa710a7d60 (patch) | |
| tree | e01e5bb07e5336e253bc66f0fb3556264152bb16 /debian | |
| parent | 3f0c8a5158e61ea1c4fcb39a71803208104cd3ac (diff) | |
changelog and quilt patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 2b414362..ac6a205c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (3.1.0-2) UNRELEASED; urgency=medium + + * Add 0004-pass-allow-unrelated-histories-to-git-merge.patch (Closes: #834895) + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 20 Aug 2016 07:31:44 -0700 + propellor (3.1.0-1) unstable; urgency=medium * Package new upstream release. diff --git a/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch b/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch new file mode 100644 index 00000000..76edcc00 --- /dev/null +++ b/debian/patches/0004-pass-allow-unrelated-histories-to-git-merge.patch @@ -0,0 +1,26 @@ +From 3f0c8a5158e61ea1c4fcb39a71803208104cd3ac Mon Sep 17 00:00:00 2001 +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sat, 20 Aug 2016 07:27:04 -0700 +Subject: [PATCH] pass --allow-unrelated-histories to git merge + +Fixes merging the /usr/src/propellor git bundle with git 2.9. +--- + src/Propellor/DotDir.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Propellor/DotDir.hs b/src/Propellor/DotDir.hs +index c73420b..cd079bc 100644 +--- a/src/Propellor/DotDir.hs ++++ b/src/Propellor/DotDir.hs +@@ -401,7 +401,7 @@ setupUpstreamMaster newref = do + changeWorkingDirectory tmprepo + git ["fetch", distrepo, "--quiet"] + git ["reset", "--hard", oldref, "--quiet"] +- git ["merge", newref, "-s", "recursive", "-Xtheirs", "--quiet", "-m", "merging upstream version"] ++ git ["merge", newref, "-s", "recursive", "-Xtheirs", "--quiet", "--allow-unrelated-histories", "-m", "merging upstream version"] + + void $ fetchUpstreamBranch tmprepo + cleantmprepo +-- +2.9.3 + diff --git a/debian/patches/series b/debian/patches/series index faf4d488..f3e51a29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-remove-README.Debian-from-propellor.cabal.patch 0002-dpkg-mergechangelogs.patch 0003-fix-ccache-haddock.patch +0004-pass-allow-unrelated-histories-to-git-merge.patch |