X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=5c8d24a7908eb891ef1ebf5765593100683f47e7;hp=87a038009a006ad1feaa5d28b7721caa122f7959;hb=346892585656da58a8d913cf9f808872a3096823;hpb=3b8d3ae177321d340de16b1dced5c9d262e56f72 diff --git a/dgit b/dgit index 87a03800..5c8d24a7 100755 --- a/dgit +++ b/dgit @@ -1047,6 +1047,12 @@ sub mktree_in_ud_here () { symlink '../../../../objects','.git/objects' or die $!; } +sub git_write_tree () { + my $tree = cmdoutput @git, qw(write-tree); + $tree =~ m/^\w+$/ or die "$tree ?"; + return $tree; +} + sub mktree_in_ud_from_only_subdir () { # changes into the subdir my (@dirs) = <*/.>; @@ -1061,8 +1067,7 @@ sub mktree_in_ud_from_only_subdir () { rmtree '.pc'; } runcmd @git, qw(add -Af); - my $tree = cmdoutput @git, qw(write-tree); - $tree =~ m/^\w+$/ or die "$tree ?"; + my $tree=git_write_tree(); return ($tree,$dir); }