From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] mergetool: use shell variable magic instead of `awk`
Date: Mon, 10 Jun 2019 10:21:31 -0700 [thread overview]
Message-ID: <xmqq7e9tnyp0.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <d6675b02918364736ec74db937481127ab7d8990.1560152205.git.j6t@kdbg.org> (Johannes Sixt's message of "Mon, 10 Jun 2019 10:59:00 +0200")
Johannes Sixt <j6t@kdbg.org> writes:
> + # here, $IFS is just a LF
> + for line in $f
> + do
> + mode=${line%% *} # 1st word
> + sha1=${line#"$mode "}
> + sha1=${sha1%% *} # 2nd word
> + case "${line#$mode $sha1 }" in # remainder
> + '1 '*)
> + base_mode=$mode
> + ;;
> + '2 '*)
> + local_mode=$mode local_sha1=$sha1
> + ;;
> + '3 '*)
> + remote_mode=$mode remote_sha1=$sha1
> + ;;
> + esac
> + done
OK. $mode won't have any glob metacharacter, and there is only one
invocation of "ls-files -u", which is now two fewer processes ;-)
>
> if is_submodule "$local_mode" || is_submodule "$remote_mode"
> then
> echo "Submodule merge conflict for '$MERGED':"
> - local_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $2;}')
> - remote_sha1=$(git ls-files -u -- "$MERGED" | awk '{if ($3==3) print $2;}')
> describe_file "$local_mode" "local" "$local_sha1"
> describe_file "$remote_mode" "remote" "$remote_sha1"
> resolve_submodule_merge
next prev parent reply other threads:[~2019-06-10 17:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 8:58 [PATCH 0/3] Reduce number of processes spawned by git-mergetool Johannes Sixt
2019-06-10 8:58 ` [PATCH 1/3] t7610-mergetool: do not place pipelines headed by `yes` in subshells Johannes Sixt
2019-06-10 9:59 ` SZEDER Gábor
2019-06-10 17:23 ` Junio C Hamano
2019-06-10 17:56 ` SZEDER Gábor
2019-06-10 18:29 ` Johannes Schindelin
2019-06-10 18:57 ` SZEDER Gábor
2019-06-10 8:58 ` [PATCH 2/3] mergetool: dissect strings with shell variable magic instead of `expr` Johannes Sixt
2019-06-10 17:17 ` Junio C Hamano
2019-06-10 21:34 ` Johannes Sixt
2019-06-10 8:59 ` [PATCH 3/3] mergetool: use shell variable magic instead of `awk` Johannes Sixt
2019-06-10 17:21 ` Junio C Hamano [this message]
2019-06-10 22:01 ` Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 0/4] Reduce number of processes spawned by git-mergetool Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 1/4] t7610-mergetool: do not place pipelines headed by `yes` in subshells Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 2/4] t7610-mergetool: use test_cmp instead of test $(cat file) = $txt Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 3/4] mergetool: dissect strings with shell variable magic instead of `expr` Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 4/4] mergetool: use shell variable magic instead of `awk` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7e9tnyp0.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).