chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f58339a
)
Break out remove_stray_gits
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 26 Jul 2015 21:20:24 +0000
(22:20 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 27 Jul 2015 02:51:44 +0000
(
03:51
+0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 660c0c33aaab3071ba79b7dfc8567716aadd9687..40e50d17ebd29d484a4b6079943f10de4ebd1260 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1217,14
+1217,7
@@
sub git_write_tree () {
return $tree;
}
return $tree;
}
-sub mktree_in_ud_from_only_subdir () {
- # changes into the subdir
- my (@dirs) = <*/.>;
- die unless @dirs==1;
- $dirs[0] =~ m#^([^/]+)/\.$# or die;
- my $dir = $1;
- changedir $dir;
-
+sub remove_stray_gits () {
my @gitscmd = qw(find -name .git -prune -print0);
debugcmd "|",@gitscmd;
open GITS, "-|", @gitscmd or failedcmd @gitscmd;
my @gitscmd = qw(find -name .git -prune -print0);
debugcmd "|",@gitscmd;
open GITS, "-|", @gitscmd or failedcmd @gitscmd;
@@
-1238,7
+1231,17
@@
sub mktree_in_ud_from_only_subdir () {
}
}
$!=0; $?=0; close GITS or failedcmd @gitscmd;
}
}
$!=0; $?=0; close GITS or failedcmd @gitscmd;
+}
+
+sub mktree_in_ud_from_only_subdir () {
+ # changes into the subdir
+ my (@dirs) = <*/.>;
+ die unless @dirs==1;
+ $dirs[0] =~ m#^([^/]+)/\.$# or die;
+ my $dir = $1;
+ changedir $dir;
+ remove_stray_gits();
mktree_in_ud_here();
my $format=get_source_format();
if (madformat($format)) {
mktree_in_ud_here();
my $format=get_source_format();
if (madformat($format)) {