On Sun, Jan 21, 2018 at 11:21:51PM -0500, James McCoy wrote:
> TL;DR, git-debcherry (or maybe just gitpkg's invocation of it) should
> likely force resolving the given treeish to a non-tag with ^{}.
>
> $ debcheckout neovim-qt && cd neovim-qt
> …
> $ git-debcherry -o ../bug v0.2.8 v0.2.8-2
> Cloning into '/tmp/git-debcherry.KYsPnT/clone'...
> done.
FWIW, this fixes the behavior for me. However, I haven't understood the
rest of the code to figure out why using tags doesn't work.
-- 8< --
diff --git i/git-debcherry w/git-debcherry
index 1ec1207..342a5f8 100755
--- i/git-debcherry
+++ w/git-debcherry
@@ -149,13 +149,13 @@ fi
_time $LINENO
upstream=$1
-if ! upstream_sha1=$(git rev-parse "$upstream" 2>$log); then
+if ! upstream_sha1=$(git rev-parse "$upstream"^{} 2>$log); then
_die "bad or missing ref: $upstream"
fi
head=${2-$(git symbolic-ref HEAD)}
head=${head##refs/heads/}
-if ! head_sha1=$(git rev-parse "$head" 2>$log); then
+if ! head_sha1=$(git rev-parse "$head"^{} 2>$log); then
_die "bad or missing ref: $head"
fi
-- >8 --
Cheers,
--
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB
