summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 00:11:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 00:52:30 +0100
commit06d4233815988df7f7583ef16444ed84dc5d8a58 (patch)
tree7ed31c49eafaf4d87460e6fa7faf602d8e0376f2 /git-debrebase
parentcd800af2e4ca8fcf72e17555472af9aa37000b3e (diff)
Dgit.pm: Move read-tree wrappers from git-debrebase
No functional change other than to no longer honour @git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase29
1 files changed, 0 insertions, 29 deletions
diff --git a/git-debrebase b/git-debrebase
index 39b700a..0be1af7 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);