Hello Sean
diff --git a/debian/control b/debian/control
index 9194b6c..21a524d 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-stm-dev,
libghc-text-dev,
libghc-concurrent-output-dev,
- git,
+ git (>= 1:2.9),
make,
Description: property-based host configuration management in haskell
Propellor ensures that the system it's run in satisfies a list of
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
don't you think that it will break propellor for all version << 1:2.9
:~$ rmadison git
git | 1:1.7.10.4-1+wheezy3 | oldstable | source, amd64, armel,
armhf, i386, ia64, kfreebsd-amd64, kfreebsd-i386, mips, mipsel, powerpc, s390,
s390x, sparc
git | 1:1.9.1-1~bpo70+1 | wheezy-backports | source, kfreebsd-amd64,
kfreebsd-i386
git | 1:1.9.1-1~bpo70+2 | wheezy-backports | source, amd64, armel,
armhf, i386, ia64, mips, mipsel, powerpc, s390, s390x, sparc
git | 1:2.1.4-2.1 | stable-kfreebsd | source, kfreebsd-amd64,
kfreebsd-i386
git | 1:2.1.4-2.1+deb8u2 | stable | source, amd64, arm64,
armel, armhf, i386, mips, mipsel, powerpc, ppc64el, s390x
git | 1:2.5.0-1 | unstable | source, kfreebsd-i386
git | 1:2.5.1-1 | unstable | source, kfreebsd-amd64
git | 1:2.6.4-1 | unstable | source, hurd-i386
git | 1:2.8.1-1 | testing | source, amd64, arm64,
armel, armhf, i386, mips, mips64el, mipsel, powerpc, ppc64el, s390x
git | 1:2.9.3-1 | unstable | source, amd64, arm64,
armel, armhf, i386, mips, mips64el, mipsel, powerpc, ppc64el, s390x
Cheers
Fred
