From: Johannes Sixt <j6t@kdbg.org>
To: Richard Hansen <hansenr@google.com>
Cc: git@vger.kernel.org, davvid@gmail.com, sbeller@google.com,
simon@ruderich.org, gitster@pobox.com
Subject: Re: [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled
Date: Tue, 10 Jan 2017 07:17:51 +0100 [thread overview]
Message-ID: <3a09e318-f14b-5f14-a992-3bd045f0a4c6@kdbg.org> (raw)
In-Reply-To: <20170109232941.43637-15-hansenr@google.com>
Am 10.01.2017 um 00:29 schrieb Richard Hansen:
> The pathnames output by the 'git rerere remaining' command are
> relative to the top-level directory but the 'git diff --name-only'
> command expects its pathname arguments to be relative to the current
> working directory. Run cd_to_toplevel before running 'git diff
> --name-only' and adjust any relative pathnames so that 'git mergetool'
> does not fail when run from a subdirectory with rerere enabled.
>
> This fixes a regression introduced in
> 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0).
>
> Based-on-patch-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Richard Hansen <hansenr@google.com>
> ---
> git-mergetool.sh | 16 ++++++++++++++--
> t/t7610-mergetool.sh | 7 ++++++-
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index b506896dc..cba6bbd05 100755
> --- a/git-mergetool.sh
> +++ b/git-mergetool.sh
> @@ -454,6 +454,15 @@ main () {
> merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
> merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
>
> + prefix=$(git rev-parse --show-prefix) || exit 1
> + cd_to_toplevel
> +
> + if test -n "$orderfile"
> + then
> + orderfile=$(git rev-parse --prefix "$prefix" -- "$orderfile") || exit 1
> + orderfile=$(printf %s\\n "$orderfile" | sed -e 1d)
Is the purpose of this complication only to detect errors of the git
invocation? IMHO, we could dispense with that, but others might
disagree. I am arguing because this adds yet another process; but it is
only paid when -O is used, so...
> + fi
> +
> if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
> then
> set -- $(git rerere remaining)
> @@ -461,14 +470,17 @@ main () {
> then
> print_noop_and_exit
> fi
> + elif test $# -ge 0
> + then
> + files_quoted=$(git rev-parse --sq --prefix "$prefix" -- "$@") || exit 1
> + eval "set -- $files_quoted"
BTW, the --sq and eval business is not required here. At this point,
$IFS = $'\n', so
set -- $(git rev-parse --sq --prefix "$prefix" -- "$@")
will do. (Except that it would not detect errors.)
> + shift
> fi
As I don't see anything wrong with what you have written, these comments
alone do not warrant another re-roll.
-- Hannes
next prev parent reply other threads:[~2017-01-10 6:18 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 0:50 [PATCH 0/4] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-04 0:50 ` [PATCH 1/4] t7610: update branch names to match test number Richard Hansen
2017-01-04 0:50 ` [PATCH 2/4] t7610: make tests more independent and debuggable Richard Hansen
2017-01-04 20:27 ` Stefan Beller
2017-01-05 15:41 ` Richard Hansen
2017-01-05 15:46 ` Richard Hansen
2017-01-05 12:20 ` Simon Ruderich
2017-01-05 15:48 ` Richard Hansen
2017-01-04 0:50 ` [PATCH 3/4] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-04 0:50 ` [PATCH 4/4] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-06 1:09 ` [PATCH v2 0/4] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-06 1:09 ` [PATCH v2 1/4] t7610: update branch names to match test number Richard Hansen
2017-01-06 1:09 ` [PATCH v2 2/4] t7610: make tests more independent and debuggable Richard Hansen
2017-01-06 1:31 ` Stefan Beller
2017-01-07 1:53 ` Richard Hansen
2017-01-06 1:09 ` [PATCH v2 3/4] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-06 1:09 ` [PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-06 9:42 ` Johannes Sixt
2017-01-07 2:16 ` Richard Hansen
2017-01-09 5:42 ` [PATCH v3 00/13] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-09 5:42 ` [PATCH v3 01/13] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-09 5:42 ` [PATCH v3 02/13] t7610: update branch names to match test number Richard Hansen
2017-01-09 5:42 ` [PATCH v3 03/13] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-09 5:42 ` [PATCH v3 04/13] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-09 5:42 ` [PATCH v3 05/13] t7610: don't rely on state from previous test Richard Hansen
2017-01-09 5:42 ` [PATCH v3 06/13] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-09 5:42 ` [PATCH v3 07/13] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-09 5:42 ` [PATCH v3 08/13] t7610: always work on a test-specific branch Richard Hansen
2017-01-09 5:42 ` [PATCH v3 09/13] t7610: don't assume the checked-out commit Richard Hansen
2017-01-09 5:42 ` [PATCH v3 10/13] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-09 5:42 ` [PATCH v3 11/13] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-09 5:42 ` [PATCH v3 12/13] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-09 5:42 ` [PATCH v3 13/13] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-09 18:12 ` Junio C Hamano
2017-01-09 19:05 ` Junio C Hamano
2017-01-09 19:53 ` Johannes Sixt
2017-01-09 22:57 ` Richard Hansen
2017-01-09 23:29 ` Junio C Hamano
2017-01-09 23:32 ` Junio C Hamano
2017-01-09 23:50 ` Richard Hansen
2017-01-09 18:49 ` [PATCH v3 00/13] fix mergetool+rerere+subdir regression Stefan Beller
2017-01-09 23:29 ` [PATCH v4 00/14] " Richard Hansen
2017-01-09 23:29 ` [PATCH v4 01/14] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-09 23:29 ` [PATCH v4 02/14] rev-parse doc: use "--" in the --prefix example Richard Hansen
2017-01-09 23:29 ` [PATCH v4 03/14] t7610: update branch names to match test number Richard Hansen
2017-01-09 23:29 ` [PATCH v4 04/14] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-09 23:29 ` [PATCH v4 05/14] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-09 23:29 ` [PATCH v4 06/14] t7610: don't rely on state from previous test Richard Hansen
2017-01-09 23:29 ` [PATCH v4 07/14] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-09 23:29 ` [PATCH v4 08/14] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-09 23:29 ` [PATCH v4 09/14] t7610: always work on a test-specific branch Richard Hansen
2017-01-09 23:29 ` [PATCH v4 10/14] t7610: don't assume the checked-out commit Richard Hansen
2017-01-09 23:29 ` [PATCH v4 11/14] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-09 23:29 ` [PATCH v4 12/14] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-09 23:29 ` [PATCH v4 13/14] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-09 23:29 ` [PATCH v4 14/14] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-10 6:17 ` Johannes Sixt [this message]
2017-01-10 17:09 ` Richard Hansen
2017-01-10 19:25 ` Junio C Hamano
2017-01-10 20:29 ` Johannes Sixt
2017-01-10 20:41 ` [PATCH v5 00/14] fix mergetool+rerere+subdir regression Richard Hansen
2017-01-10 20:41 ` [PATCH v5 01/14] .mailmap: Use my personal email address as my canonical Richard Hansen
2017-01-10 20:41 ` [PATCH v5 02/14] rev-parse doc: pass "--" to rev-parse in the --prefix example Richard Hansen
2017-01-10 20:41 ` [PATCH v5 03/14] t7610: update branch names to match test number Richard Hansen
2017-01-10 20:41 ` [PATCH v5 04/14] t7610: Move setup code to the 'setup' test case Richard Hansen
2017-01-10 20:41 ` [PATCH v5 05/14] t7610: use test_when_finished for cleanup tasks Richard Hansen
2017-01-10 20:41 ` [PATCH v5 06/14] t7610: don't rely on state from previous test Richard Hansen
2017-01-10 20:41 ` [PATCH v5 07/14] t7610: run 'git reset --hard' after each test to clean up Richard Hansen
2017-01-10 20:41 ` [PATCH v5 08/14] t7610: delete some now-unnecessary 'git reset --hard' lines Richard Hansen
2017-01-10 20:41 ` [PATCH v5 09/14] t7610: always work on a test-specific branch Richard Hansen
2017-01-10 20:41 ` [PATCH v5 10/14] t7610: don't assume the checked-out commit Richard Hansen
2017-01-10 20:41 ` [PATCH v5 11/14] t7610: spell 'git reset --hard' consistently Richard Hansen
2017-01-10 20:42 ` [PATCH v5 12/14] t7610: add test case for rerere+mergetool+subdir bug Richard Hansen
2017-01-10 20:42 ` [PATCH v5 13/14] mergetool: take the "-O" out of $orderfile Richard Hansen
2017-01-10 20:42 ` [PATCH v5 14/14] mergetool: fix running in subdir when rerere enabled Richard Hansen
2017-01-10 4:36 ` [PATCH 0/4] fix mergetool+rerere+subdir regression David Aguilar
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a09e318-f14b-5f14-a992-3bd045f0a4c6@kdbg.org \
--to=j6t@kdbg.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hansenr@google.com \
--cc=sbeller@google.com \
--cc=simon@ruderich.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).