diff options
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -764,6 +764,18 @@ t-gbp-unapplied-pq2qc () { git commit -m 'Commit patch queue' } +t-git-pseudo-merge () { + # like git merge -s ours + if [ ! "$git_pseuomerge_opts" ]; then + if git merge --help \ + | grep -q allow-unrelated-histories; then + git_pseuomerge_opts='--allow-unrelated-histories' + fi + git_pseuomerge_opts+=' -s ours' + fi + git merge $git_pseuomerge_opts "$@" +} + t-gbp-example-prep () { t-tstunt-parsechangelog t-archive example 1.0-1 @@ -785,7 +797,7 @@ t-gbp-example-prep () { t-commit 'some updates' 1.0-2 - git merge -s ours \ + t-git-pseudo-merge \ -m 'Pseudo-merge to make descendant of archive' \ remotes/dgit/dgit/sid } |