From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Oct 2014 17:43:37 +0000 (+0000)
Subject: Break out mktree_in_ud_here (nfc)
X-Git-Tag: debian/0.30~318
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8293f64249970c85187371555ad7bd162a37d695

Break out mktree_in_ud_here (nfc)
---

diff --git a/dgit b/dgit
index 6fd8f7d7..b13b5ed5 100755
--- a/dgit
+++ b/dgit
@@ -976,6 +976,12 @@ sub prep_ud () {
     mkdir $ud or die $!;
 }
 
+sub mktree_in_ud_here () {
+    runcmd qw(git init -q);
+    rmtree('.git/objects');
+    symlink '../../../../objects','.git/objects' or die $!;
+}
+
 sub mktree_in_ud_from_only_subdir () {
     # changes into the subdir
     my (@dirs) = <*/.>;
@@ -984,10 +990,7 @@ sub mktree_in_ud_from_only_subdir () {
     my $dir = $1;
     changedir $dir;
     fail "source package contains .git directory" if stat_exists '.git';
-    die $! unless $!==&ENOENT;
-    runcmd qw(git init -q);
-    rmtree('.git/objects');
-    symlink '../../../../objects','.git/objects' or die $!;
+    mktree_in_ud_here();
     runcmd @git, qw(add -Af);
     my $tree = cmdoutput @git, qw(write-tree);
     $tree =~ m/^\w+$/ or die "$tree ?";