X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=06f56d872abe5bcf98a966ae61bf2d2080a7a49a;hb=7593c9b857a3d4517d8772ff0e31faf5cc3b4fb4;hp=e307af843da884e4d5e8b39fd9fec8f68465bc30;hpb=44250fed27c2cf4b3ff93e6510a8017fcc09c402;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index e307af84..06f56d87 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -3,7 +3,8 @@
 # Script helping make fast-forwarding histories while still rebasing
 # upstream deltas when working on Debian packaging
 #
-# Copyright (C)2017,2018 Ian Jackson
+# Copyright (C)2017-2019 Ian Jackson
+# Copyright (C)2019      Niko Tyni
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -120,7 +121,6 @@ our $playprefix = 'debrebase';
 our $rd;
 our $workarea;
 
-our @git = qw(git);
 our @dgit = qw(dgit);
 
 sub in_workarea ($) {
@@ -2662,7 +2662,7 @@ sub cmd_convert_from_dgit_view () {
 	my $spec = shift @ARGV;
 	my $commit = git_rev_parse "$spec^{commit}";
 	push @upstreams, { Commit => $commit,
-			   Source => (f_ "%s, from command line", $ARGV[0]),
+			   Source => (f_ "%s, from command line", $spec),
 			   Only => 1,
 			 };
     }