From 027613e7a281123f4512ca4c1b99552cc78ca72b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 21:08:00 +0100
Subject: [PATCH] Dgit.pm: Move make_commit_text from dgit

NFC other than the usual change to literal `git'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Debian/Dgit.pm | 23 +++++++++++++++++++++++
 dgit           | 22 ----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f68b7c91..9d2e4719 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -57,6 +57,7 @@ BEGIN {
                       git_for_each_tag_referring is_fast_fwd
 		      git_check_unmodified
 		      git_reflog_action_msg  git_update_ref_cmd
+		      make_commit_text
                       $package_re $component_re $deliberately_re
 		      $distro_re $versiontag_re $series_filename_re
 		      $orig_f_comp_re $orig_f_sig_re $orig_f_tail_re
@@ -687,6 +688,28 @@ sub parsechangelog_loop ($$$) {
     close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd;
 }	
 
+sub make_commit_text ($) {
+    my ($text) = @_;
+    my ($out, $in);
+    my @cmd = (qw(git hash-object -w -t commit --stdin));
+    debugcmd "|",@cmd;
+    print Dumper($text) if $debuglevel > 1;
+    my $child = open2($out, $in, @cmd) or die $!;
+    my $h;
+    eval {
+	print $in $text or die $!;
+	close $in or die $!;
+	$h = <$out>;
+	$h =~ m/^\w+$/ or die;
+	$h = $&;
+	printdebug "=> $h\n";
+    };
+    close $out;
+    waitpid $child, 0 == $child or die "$child $!";
+    $? and failedcmd @cmd;
+    return $h;
+}
+
 # ========== playground handling ==========
 
 # terminology:
diff --git a/dgit b/dgit
index 51cac148..6879e541 100755
--- a/dgit
+++ b/dgit
@@ -1991,28 +1991,6 @@ sub make_commit ($) {
     return cmdoutput @git, qw(hash-object -w -t commit), $file;
 }
 
-sub make_commit_text ($) {
-    my ($text) = @_;
-    my ($out, $in);
-    my @cmd = (@git, qw(hash-object -w -t commit --stdin));
-    debugcmd "|",@cmd;
-    print Dumper($text) if $debuglevel > 1;
-    my $child = open2($out, $in, @cmd) or die $!;
-    my $h;
-    eval {
-	print $in $text or die $!;
-	close $in or die $!;
-	$h = <$out>;
-	$h =~ m/^\w+$/ or die;
-	$h = $&;
-	printdebug "=> $h\n";
-    };
-    close $out;
-    waitpid $child, 0 == $child or die "$child $!";
-    $? and failedcmd @cmd;
-    return $h;
-}
-
 sub clogp_authline ($) {
     my ($clogp) = @_;
     my $author = getfield $clogp, 'Maintainer';
-- 
2.30.2