Move git_rev_parse into Dgit.pm (renaming it from rev_parse

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 4f0329a49932b21caf94395785b6eb4bf167e551..c6a3596605fd9657c17f877ad8f7e733e902f8db 100755 (executable)
--- 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;