Commit bc5193ed authored by Kevin Atkinson's avatar Kevin Atkinson

Comment out effect of last commit. I want to know more of why I need

to do a "git clean" before I start blindly removing files.
parent 528d3a20
...@@ -203,7 +203,7 @@ sub init($) { ...@@ -203,7 +203,7 @@ sub init($) {
cd_merge(); cd_merge();
my $base = merge_base @branches; my $base = merge_base @branches;
sys "git $cmd $base"; sys "git $cmd $base";
sys "git clean -f -d"; #sys "git clean -f -d";
sys "git commit -q --allow-empty -m Marker"; sys "git commit -q --allow-empty -m Marker";
sys "git tag -f merge-base"; sys "git tag -f merge-base";
} }
...@@ -243,7 +243,7 @@ sub auto_reset() { ...@@ -243,7 +243,7 @@ sub auto_reset() {
} else { } else {
print "Need to reset to $reset_point^\n"; print "Need to reset to $reset_point^\n";
sys "git reset -q --hard $reset_point^"; sys "git reset -q --hard $reset_point^";
sys "git clean -f -d"; #sys "git clean -f -d";
} }
} }
} }
...@@ -285,7 +285,7 @@ if ($op eq 'prep') { ...@@ -285,7 +285,7 @@ if ($op eq 'prep') {
sys "git fetch -q origin"; sys "git fetch -q origin";
auto_reset() if $auto_reset; auto_reset() if $auto_reset;
sys "git reset -q --hard"; sys "git reset -q --hard";
sys "git clean -f -d"; #sys "git clean -f -d";
foreach (@branches) { foreach (@branches) {
unlink ".git/MERGE_HEAD"; unlink ".git/MERGE_HEAD";
my $cmd = "git merge -q $_"; my $cmd = "git merge -q $_";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment