From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 May 2015 13:45:39 +0000 (+0100)
Subject: Move git_rev_parse into Dgit.pm (renaming it from rev_parse
X-Git-Tag: debian/0.30~142
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d3009c4371f9209cd6745caa5e422355ac6692a7

Move git_rev_parse into Dgit.pm (renaming it from rev_parse
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 00b4aa54..2c9c9f91 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -18,7 +18,7 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists fail waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
-                      git_for_each_ref
+                      git_rev_parse git_for_each_ref
                       git_for_each_tag_referring
                       $package_re $component_re $deliberately_re
                       $branchprefix
@@ -177,6 +177,10 @@ sub cmdoutput {
     return $d;
 }
 
+sub git_rev_parse ($) {
+    return cmdoutput qw(git rev-parse), "$_[0]~0";
+}
+
 sub git_for_each_ref ($$) {
     my ($pattern,$func) = @_;
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
diff --git a/dgit b/dgit
index 4f0329a4..c6a35966 100755
--- a/dgit
+++ b/dgit
@@ -1271,16 +1271,12 @@ sub ensure_we_have_orig () {
     }
 }
 
-sub rev_parse ($) {
-    return cmdoutput @git, qw(rev-parse), "$_[0]~0";
-}
-
 sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
     my @cmd = (@git, qw(merge-base), $ancestor, $child);
     my $mb = cmdoutput_errok @cmd;
     if (defined $mb) {
-	return rev_parse($mb) eq rev_parse($ancestor);
+	return git_rev_parse($mb) eq git_rev_parse($ancestor);
     } else {
 	$?==256 or failedcmd @cmd;
 	return 0;
@@ -1658,7 +1654,7 @@ sub dopush ($) {
 #    runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
 #        map { lref($_).":".rref($_) }
 #        (uploadbranch());
-    my $head = rev_parse('HEAD');
+    my $head = git_rev_parse('HEAD');
     if (!$changesfile) {
 	my $multi = "$buildproductsdir/".
 	    "${package}_".(stripepoch $cversion)."_multi.changes";
@@ -2403,7 +2399,7 @@ sub build_maybe_quilt_fixup () {
     #     6. Back in the main tree, fast forward to the new HEAD
 
     my $clogp = parsechangelog();
-    my $headref = rev_parse('HEAD');
+    my $headref = git_rev_parse('HEAD');
 
     prep_ud();
     changedir $ud;