Dgit.pm: Break out git_get_symref

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index abcf123652e6db4917b9305cbdb5245d8802499e..ebf9d7db0dfcbc5e4838ad9bf6ccbe1cf7f5ccaa 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -49,7 +49,7 @@ BEGIN {
                      failedcmd_report_cmd failedcmd
                       runcmd cmdoutput cmdoutput_errok
                       git_rev_parse git_cat_file
-                     git_get_ref git_for_each_ref
+                     git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                      $distro_re $versiontag_re $series_filename_re
@@ -381,6 +381,19 @@ sub git_cat_file ($;$) {
     return $chk->($type, $data);
 }
 
+sub git_get_symref (;$) {
+    my ($symref) = @_;  $symref //= 'HEAD';
+    # => undef if not a symref, otherwise refs/...
+    my @cmd = (qw(git symbolic-ref -q HEAD));
+    my $branch = cmdoutput_errok @cmd;
+    if (!defined $branch) {
+       $?==256 or failedcmd @cmd;
+    } else {
+       chomp $branch;
+    }
+    return $branch;
+}
+
 sub git_for_each_ref ($$;$) {
     my ($pattern,$func,$gitdir) = @_;
     # calls $func->($objid,$objtype,$fullrefname,$reftail);

diff --git a/debian/changelog b/debian/changelog
index 464a433c514446cd6eb699e2b5d3a14b13012419..62d8eedede0318d623e2785483a9f53cfd56d561 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dgit (4.5~) unstable; urgency=medium
 
   Internal changes:
   * Move $playground global to dgit.
+  * Break git_get_symref out into Dgit.pm.
 
  --
 

diff --git a/dgit b/dgit
index 9ce797200102205a4dc2f566cdd6faf281ab00ae..aaafefb736a05d88258e7c5d4f0023c174f37cf3 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4511,13 +4511,8 @@ sub cmd_clone {
 }
 
 sub branchsuite () {
-    my @cmd = (@git, qw(symbolic-ref -q HEAD));
-    my $branch = cmdoutput_errok @cmd;
-    if (!defined $branch) {
-       $?==256 or failedcmd @cmd;
-       return undef;
-    }
-    if ($branch =~ m#$lbranch_re#o) {
+    my $branch = git_get_symref();
+    if (defined $branch && $branch =~ m#$lbranch_re#o) {
        return $1;
     } else {
        return undef;