diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-10-27 17:43:37 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-05 18:02:50 +0000 |
commit | 8293f64249970c85187371555ad7bd162a37d695 (patch) | |
tree | da868cae3509fda2c798744f7b28460846789958 | |
parent | 481f40a9a020a73683acde466b73e6d8a269ae8d (diff) |
Break out mktree_in_ud_here (nfc)
-rwxr-xr-x | dgit | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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 ?"; |