X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=06f56d872abe5bcf98a966ae61bf2d2080a7a49a;hp=eb585e33ad4976add6238e6bd5fb442d7b85fe4b;hb=524d221c7e3b70db546be01d4929a1e9a56e14b7;hpb=359f4592c6035ee027cf283c6af7dcd435038776

diff --git a/git-debrebase b/git-debrebase
index eb585e33..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 ($) {
@@ -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);
@@ -1994,28 +1956,6 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub resolve_upstream_version ($$) {
-    my ($new_upstream, $upstream_version) = @_;
-
-    my $used = $new_upstream;
-    if (!defined $new_upstream) {
-	my @tried;
-	$new_upstream = upstream_commitish_search $upstream_version, \@tried;
-	if (!length $new_upstream) {
-	    fail f_
-		"Could not determine appropriate upstream commitish.\n".
-		" (Tried these tags: %s)\n".
-		" Check version, and specify upstream commitish explicitly.",
-		"@tried";
-	}
-	$used = $tried[-1];
-    }
-    $new_upstream = git_rev_parse $new_upstream;
-
-    return ($new_upstream, $used);
-    # used is a human-readable idea of what we found
-}
-
 sub cmd_new_upstream () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done
@@ -2722,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,
 			 };
     }