X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;fp=git-debrebase;h=0be1af74f7a28b6fa8088df76db4a99d5adaf241;hp=39b700a51ea8cdd1c67deed10bab3b1b66472aa9;hb=06d4233815988df7f7583ef16444ed84dc5d8a58;hpb=cd800af2e4ca8fcf72e17555472af9aa37000b3e

diff --git a/git-debrebase b/git-debrebase
index 39b700a5..0be1af74 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -355,35 +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);