summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-22 18:08:24 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-22 18:08:24 +0100
commit77348a4d813fbd0b7252eff1615332d77cecff78 (patch)
treec00f33026900700ce63112021a8fb9b2401c8741 /dgit
parent6158e278ce8f408dac7ecae93dac8d0df7da62f5 (diff)
Name the local remote tracking branch remotes/dgit/dgit/<suite> so that we avoid a warning from git about ambiguous branch names.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index 4e9afe0..2259613 100755
--- a/dgit
+++ b/dgit
@@ -68,7 +68,7 @@ our $csuite;
sub lbranch () { return "$branchprefix/$csuite"; }
my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
sub lref () { return "refs/heads/".lbranch(); }
-sub lrref () { return "refs/remotes/$remotename/$csuite"; }
+sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
sub rrref () { return "refs/$branchprefix/$csuite"; }
sub debiantag ($) {
my ($v) = @_;