Re: MERGE_RR droppings

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 26, 2012, 05:30 UTC
Message-ID: <7vtxxyd4hz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr7Hj4f-Gww4j89kppR8g1vzmhmydsFnG0ecjzL5WrRP4g@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

Show 6 quoted lines

>> Perhaps mergetool should consider a missing MERGE_RR and an empty
>> one the same way?
>
> Would that test look (roughly) like this?
>
>     if test -f "$GIT_DIR/MERGE_RR" && test -n "$(cat "$GIT_DIR/MERGE_RR")"

Hrm, would "test -s $that_file" be simpler?

Show 8 quoted lines

>     then
> 	files=$(git rerere remaining)
>     else
> 	files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
>     fi
>     ...
>
> If so I'll throw together a patch.