From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Oct 2016 19:16:17 +0000 (+0100)
Subject: import-dsc: Refuse to update a checked-out branch
X-Git-Tag: archive/debian/2.9~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5c9ed5c0a77935dca8bb6f0c1cf6181d2ee54e48

import-dsc: Refuse to update a checked-out branch

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

diff --git a/dgit b/dgit
index 88df4ef5..809d0b9d 100755
--- a/dgit
+++ b/dgit
@@ -5284,6 +5284,13 @@ sub cmd_import_dsc {
     $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
     $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
 
+    my @symcmd = (@git, qw(symbolic-ref -q HEAD));
+    my $chead = cmdoutput_errok @symcmd;
+    defined $chead or $?==256 or failedcmd @symcmd;
+
+    fail "$dstbranch is checked out - will not update it"
+	if defined $chead and $chead eq $dstbranch;
+
     open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
     $dscdata = do { local $/ = undef; <D>; };
     D->error and fail "read $dscfn: $!";