X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=165dc66a70b467b20ab53c36d541314d1be88f8a;hb=152d6e7081e4a4a6ccdfe744f885ebde57866e14;hp=706af5425130298c9968fa3b298842db0dd6bf4b;hpb=7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 706af542..165dc66a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -196,6 +196,8 @@ sub get_tree ($;$$) {
 	return () if $type eq 'missing';
     }
 
+    confess "get_tree needs object not $x ?" unless $x =~ m{^[0-9a-f]+\:};
+
     our (@get_tree_memo, %get_tree_memo);
     my $memo = $get_tree_memo{$x};
     return @$memo if $memo;
@@ -681,6 +683,8 @@ sub merge_series_patchqueue_convert ($$$) {
 	runcmd @git, qw(checkout -q -b mergec), $merged_pq;
 
 	merge_attempt_cmd($wrecknotes, qw(gbp pq import));
+	# MERGE-TODO consider git-format-patch etc. instead,
+	# since gbp pq doesn't always round-trip :-/
 
 	# OK now we are on patch-queue/merge, and we need to rebase
 	# onto the intended parent and drop the patches from each one