Junio C Hamano <junkio@xxxxxxx> wrote:
> Eric Wong <normalperson@xxxxxxxx> writes:
>
> > +if (@ARGV && $ARGV[0] eq 'clear') {
> > + for my $path (keys %merge_rr) {
> > + my $name = $merge_rr{$path};
> > + if (-d "$rr_dir/$name") {
> > + rmtree(["$rr_dir/$name"]);
> > + }
> > + }
> > + unlink $merge_rr;
> > + exit 0;
> > +}
>
> Come to think of it, I am not sure about this one. Don't you
> need to make sure that there is no existing resolution before
> removing it? In other words, shouldn't the removal be like this?
>
> if (-d "$rr_dir/$name" && ! -f "$rr_dir/$name/postimage") {
> rmtree(["$rr_dir/$name"]);
> }
Yes. However, it seems unlikely, that MERGE_RR would point to something
that has a postimage. I suppose that a machine could crash or a user
could've hit ^C at the correct millisecond that would cause rerere to
not update MERGE_RR correctly.
Updated patches on the way (leaving out the status updates).
--
Eric Wong
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html