Re: [PATCH v3] contrib git-resurrect: find traces of a branch name and resurrect it

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 2, 2009, 02:31 UTC
Message-ID: <7vljsppo14.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1233524085-25342-1-git-send-email-trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

Show 18 quoted lines

>> Reading everything down to the root commit sounds like fun.  rev-list
>> gives you the output from newer to older so you may want to break out once
>> you have found enough candidates.
>> 
>> Anyway, if I were doing this script, I'd write this part like this without
>> a shell loop:
>> 
>>         _x40="[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
>>         _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
>> 
>> 	git rev-list --all --grep="Merge branch '$1'" \
>>         	--pretty=tformat:"%H %P %s" |
>> 	sed -ne "s/^$_x40 $_x40 \($_x40\) Merge .*/\1/p"
>
> Nice trick.  The same also works for scan_merge_targets() and gives it
> a nice speed boost too.  Unfortunately my sed-fu is not good enough to
> figure out how to only print the first line (for resurrections from
> pu, we expect there to be a single match).

Do you mean something like this?

	sed -n -e "/^$_x40 $_x40 \($_x40\) Merge .*/ {
		s//\1/p
                q
        }"