From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Fernando Ramos <greenfoo@u92.eu>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] mergetool(vimdiff): allow paths to contain spaces again
Date: Wed, 13 Jul 2022 14:08:11 -0700 [thread overview]
Message-ID: <xmqq7d4gbu10.fsf@gitster.g> (raw)
In-Reply-To: <pull.1287.git.1657726969774.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Wed, 13 Jul 2022 15:42:49 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> if $base_present
> then
> ...
> + base_present=1
I think s/1/true/ or something is in order, perhaps?
> + LOCAL='lo cal'
> + BASE='ba se'
> + REMOTE="' '"
> + MERGED='mer ged'
> + merge_tool_path=record_parameters
> +
> + merge_cmd vimdiff || at_least_one_ko=true
> +
> + cat >expect <<-\EOF
> + -f
> + -c
> + echo | split | vertical split | 1b | wincmd l | vertical split | quit | wincmd l | 2b | wincmd j | 3b | tabdo windo diffthis
> + -c
> + tabfirst
> + lo cal
> + ' '
> + mer ged
> + EOF
> +
> + diff -u expect actual || at_least_one_ko=true
> +
> if test "$at_least_one_ko" = "true"
> then
> return 255
>
> base-commit: 980145f7470e20826ca22d7343494712eda9c81d
next prev parent reply other threads:[~2022-07-13 21:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 15:42 [PATCH] mergetool(vimdiff): allow paths to contain spaces again Johannes Schindelin via GitGitGadget
2022-07-13 16:22 ` Junio C Hamano
2022-07-13 20:52 ` Fernando Ramos
2022-07-13 20:54 ` Junio C Hamano
2022-07-13 21:08 ` Junio C Hamano [this message]
2022-07-13 21:33 ` Fernando Ramos
2022-07-13 21:54 ` Junio C Hamano
2022-07-13 22:06 ` Junio C Hamano
2022-07-13 22:28 ` Fernando Ramos
2022-07-13 22:22 ` Fernando Ramos
2022-07-13 22:33 ` Junio C Hamano
2022-07-14 14:31 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2022-07-14 16:27 ` Junio C Hamano
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=xmqq7d4gbu10.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=greenfoo@u92.eu \
--cc=johannes.schindelin@gmx.de \
/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).