From 4b860909da046779922347e233d4a29c64521e1c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Nov 2016 23:03:31 +0000
Subject: dgit: Introduce git_add_write_tree

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 6a74307..8979501 100755
--- a/dgit
+++ b/dgit
@@ -1693,6 +1693,11 @@ sub git_write_tree () {
     return $tree;
 }
 
+sub git_add_write_tree () {
+    runcmd @git, qw(add -Af .);
+    return git_write_tree();
+}
+
 sub remove_stray_gits () {
     my @gitscmd = qw(find -name .git -prune -print0);
     debugcmd "|",@gitscmd;
@@ -5195,8 +5200,7 @@ sub quilt_fixup_multipatch ($$$) {
 
     rmtree '.pc';
 
-    runcmd @git, qw(add -Af .);
-    my $unapplied=git_write_tree();
+    my $unapplied=git_add_write_tree();
     printdebug "fake orig tree object $unapplied\n";
 
     ensuredir '.pc';
@@ -5228,8 +5232,7 @@ END
 
     changedir '../fake';
     rmtree '.pc';
-    runcmd @git, qw(add -Af .);
-    my $oldtiptree=git_write_tree();
+    my $oldtiptree=git_add_write_tree();
     printdebug "fake o+d/p tree object $unapplied\n";
     changedir '../work';
 
-- 
cgit v1.2.3