[SCM] pkg-kde-jenkins packaging branch, master, updated. 2b3a7af147c50274fbd109d636bc692083044649

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=2846f6c

The following commit has been merged in the master branch:
commit 2846f6cfc5b4d901aef8fff1d984bb5662095958
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 9 13:07:43 2016 +0200

    update_refresh_patches: Add allow unrelated histories merge parameter
    
    git merge complains with fatal: refusing to merge unrelated histories
    This should be properly fixed with the gbp-buildpackage's patch to
    allow unmerged branches in pq
---
 hooks/prepare/update_refresh_patches | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/prepare/update_refresh_patches b/hooks/prepare/update_refresh_patches
index 3915543..b58ae0f 100755
--- a/hooks/prepare/update_refresh_patches
+++ b/hooks/prepare/update_refresh_patches
@@ -98,7 +98,7 @@ def create_merged_branch(workdir, tag, merged_branch):
     cmd = ['git', 'checkout', '-B', merged_branch]
     subprocess.run(cmd, cwd=workdir, check=True)
     full_tag = 'refs/tags/{}'.format(tag)
-    cmd = ['git', 'merge', '--no-edit', full_tag]
+    cmd = ['git', 'merge', '--allow-unrelated-histories', '--no-edit', full_tag]
     subprocess.run(cmd, cwd=workdir, check=True)
 
 

-- 
pkg-kde-jenkins packaging