X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=781435861ecb05b1c816a440364425746abae6f7;hb=193cfa37a544a2c44f9252b83da54ca1af01c01f;hp=39b700a51ea8cdd1c67deed10bab3b1b66472aa9;hpb=cd800af2e4ca8fcf72e17555472af9aa37000b3e;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 39b700a5..78143586 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 ($) {
@@ -355,44 +355,6 @@ sub calculate_committer_authline () {
     return $&;
 }
 
-sub rm_subdir_cached ($) {
-    my ($subdir) = @_;
-    runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
-}
-
-sub read_tree_subdir ($$) {
-    my ($subdir, $new_tree_object) = @_;
-    rm_subdir_cached $subdir;
-    runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
-}
-
-sub read_tree_debian ($) {
-    my ($treeish) = @_;
-    read_tree_subdir 'debian', "$treeish:debian";
-    rm_subdir_cached 'debian/patches';
-}
-
-sub read_tree_upstream ($;$$) {
-    my ($treeish, $keep_patches, $tree_with_debian) = @_;
-    # if $tree_with_debian is supplied, will use that for debian/
-    # otherwise will save and restore it.
-    my $debian =
-	$tree_with_debian ? "$tree_with_debian:debian"
-	: cmdoutput @git, qw(write-tree --prefix=debian/);
-    runcmd @git, qw(read-tree), $treeish;
-    read_tree_subdir 'debian', $debian;
-    rm_subdir_cached 'debian/patches' unless $keep_patches;
-};
-
-sub make_commit ($$) {
-    my ($parents, $message_paras) = @_;
-    my $tree = cmdoutput @git, qw(write-tree);
-    my @cmd = (@git, qw(commit-tree), $tree);
-    push @cmd, qw(-p), $_ foreach @$parents;
-    push @cmd, qw(-m), $_ foreach @$message_paras;
-    return cmdoutput @cmd;
-}
-
 our @snag_force_opts;
 sub snag ($$;@) {
     my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
@@ -768,7 +730,7 @@ sub merge_series_patchqueue_convert ($$$) {
 	    open C, ">", "../mcommit" or confess "$!";
 	    print C $commit or confess "$!";
 	    close C or confess "$!";
-	    $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
+	    $build = hash_commit '../mcommit';
 	}
 	$result = $build;
 	mwrecknote($wrecknotes, 'merged-result', $result);
@@ -2011,7 +1973,7 @@ sub cmd_new_upstream () {
 	$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
     }
 
-    my $new_upstream = shift @ARGV;
+    my $new_upstream = (@ARGV && $ARGV[0] !~ m{^-}) ? shift @ARGV : undef;
     my $new_upstream_version = upstreamversion  $new_version;
     my $new_upstream_used;
     ($new_upstream, $new_upstream_used) =
@@ -2700,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,
 			 };
     }
@@ -2735,10 +2697,11 @@ END
     if (!@upstreams) {
 	if ($do_tags) {
 	    my @tried;
-	    my $ups_tag = upstream_commitish_search $version, \@tried;
-	    if ($ups_tag) {
-		my $this = f_ "git tag %s", $tried[-1];
-		push @upstreams, { Commit => $ups_tag,
+	    my ($ups_tag, $ups_rev) =
+	        upstream_commitish_search $version, \@tried;
+	    if ($ups_rev) {
+		my $this = f_ "git tag %s", $ups_tag;
+		push @upstreams, { Commit => $ups_rev,
 				   Source => $this,
 				 };
 	    } else {
@@ -2987,7 +2950,7 @@ getoptions_main
 	   'experimental-merge-resolution!', \$opt_merges,
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;
-	       badusage f_ "%s: no cuddling to -i for git-rebase", $us
+	       badusage f_ "%s: with git-debrebase, get-rebase -i option may only be followed by more options (as separate arguments)", $us
 		   if length $val;
 	       confess if $opt_defaultcmd_interactive; # should not happen
 	       $opt_defaultcmd_interactive = [ qw(-i) ];