catacomb-import-update: Investigate donor during convert

The information we collect here isn't used in --convert mode.

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

diff --git a/catacomb-import-update b/catacomb-import-update
index fffbe7a001e791c339fa81eaf5fd717c129af91e..1d8e0ff3bf5eb42a2727b08b9be9137800c0751d 100755 (executable)
--- a/catacomb-import-update
+++ b/catacomb-import-update
@@ -910,13 +910,12 @@ if ($DOCONVERT) {
   $DONOR_DIR =~ s{[^/]+$}{$DONOR_IMPORT_DIR} or die "$0 ?";
 } else {
   $DONOR_DIR = "../catacomb";
+  chomp ($DONOR_VERSION = capturex @with_dir, $DONOR_DIR,
+        "git", "describe", "--abbrev=4", "--dirty=+");
+  chomp ($DONOR_REVISION = capturex @with_dir, $DONOR_DIR,
+        "git", "rev-parse", "HEAD");
 }
 
-chomp ($DONOR_VERSION = capturex @with_dir, $DONOR_DIR,
-       "git", "describe", "--abbrev=4", "--dirty=+");
-chomp ($DONOR_REVISION = capturex @with_dir, $DONOR_DIR,
-       "git", "rev-parse", "HEAD");
-
 note_path 'debian/copyright', undef;
 
 do { no autodie; mkdir $RECIP_DIR; }