diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-17 14:45:39 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 11:54:15 +0100 |
commit | d3009c4371f9209cd6745caa5e422355ac6692a7 (patch) | |
tree | fc68df8512abe5ebf95e80fbbcbf17c57df404a6 /dgit | |
parent | e6ce71a87a1ca14ce90fc78023725d9f3bec54ee (diff) |
Move git_rev_parse into Dgit.pm (renaming it from rev_parse
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -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; |