From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/2 (fix broken test)] rebase -i: add exec command to launch a shell command
Date: Wed, 11 Aug 2010 11:31:57 -0700 [thread overview]
Message-ID: <7v62zhyp9e.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1281453472-29835-1-git-send-email-Matthieu.Moy@imag.fr
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> The typical usage pattern would be to run a test (or simply a compilation
> command) at given points in history.
>
> The shell command is ran (from the worktree root), and the rebase is
> stopped when the command fails, to give the user an opportunity to fix
> the problem before continuing with "git rebase --continue".
>
> This needs a little rework of skip_unnecessary_picks, which wasn't robust
> enough to deal with lines like
>
> exec >"file name with many spaces"
>
> in the todolist. The new version extracts command, sha1 and rest from
> each line, but outputs the line itself verbatim to avoid changing the
> whitespace layout.
Thanks.
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 9f03ce6..93b181e 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -64,6 +64,67 @@ test_expect_success 'setup' '
> done
> '
>
> +# "exec" commands are ran with the user shell by default, but this may
> +# be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work
> +# to create a file. Unseting SHELL avoids such non-portable behavior
> +# in tests.
> +SHELL=
Tricky but true.
Do we have other callouts that we use $SHELL from the environment?
execv_shell_cmd() just runs "sh -c" from $PATH so diff (when running
external diff) nor ll-merge (when running external merge driver) that call
it via run_command_v_opt(RUN_USING_SHELL) are immune to this issue.
next prev parent reply other threads:[~2010-08-11 18:32 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 13:08 Black smoke from git rebase -i exec Ævar Arnfjörð Bjarmason
2010-08-10 13:37 ` Matthieu Moy
2010-08-10 13:57 ` Ævar Arnfjörð Bjarmason
2010-08-10 14:12 ` Johannes Sixt
2010-08-10 14:16 ` Ævar Arnfjörð Bjarmason
2010-08-10 15:05 ` Matthieu Moy
2010-08-10 15:17 ` [PATCH 1/2 (fix broken test)] rebase -i: add exec command to launch a shell command Matthieu Moy
2010-08-11 18:31 ` Junio C Hamano [this message]
2010-08-12 7:47 ` Matthieu Moy
2011-01-16 1:59 ` [PATCH 0/2] rebase -i: in-editor documentation nits Jonathan Nieder
2011-01-16 2:01 ` [PATCH 1/2] rebase -i: reword in-editor documentation of "exec" Jonathan Nieder
2011-01-16 10:27 ` Matthieu Moy
2011-01-18 15:05 ` Junio C Hamano
2011-01-20 20:09 ` Jonathan Nieder
2011-01-20 20:59 ` Junio C Hamano
2011-01-21 0:36 ` [PATCH 1/2 v2] rebase -i: clarify " Jonathan Nieder
2011-01-21 6:59 ` Matthieu Moy
2011-01-21 7:47 ` Jonathan Nieder
2011-01-21 10:43 ` Matthieu Moy
2011-01-16 2:02 ` [PATCH 2/2] rebase -i: explain how to discard all commits Jonathan Nieder
2011-01-20 19:39 ` [PATCH 2/2] " Nicolas Sebrecht
2011-01-20 19:57 ` Jonathan Nieder
2011-01-20 20:08 ` Nicolas Sebrecht
2011-01-20 20:34 ` Thomas Rast
2011-01-20 21:28 ` Junio C Hamano
2011-01-21 7:04 ` Johannes Schindelin
2011-01-21 7:37 ` [PATCH] Documentation: suggest "reset --keep" to undo a commit Jonathan Nieder
2011-01-21 17:34 ` Junio C Hamano
2011-01-21 19:14 ` Jonathan Nieder
2011-01-21 20:28 ` Junio C Hamano
2011-01-21 16:51 ` [PATCH 2/2] Re: rebase -i: explain how to discard all commits Junio C Hamano
2011-01-21 17:05 ` Matthieu Moy
2011-01-21 17:57 ` Joshua Jensen
2011-01-21 18:37 ` [PATCH] Documentation: do not treat reset --keep as a special case Jonathan Nieder
2011-01-21 20:35 ` Junio C Hamano
2011-01-26 7:33 ` [PATCH 2/2] Re: rebase -i: explain how to discard all commits Jay Soffian
2011-01-23 20:10 ` Johannes Schindelin
2010-08-10 15:17 ` [PATCH 2/2] test-lib: user-friendly alternatives to test [-d|-f|-e] Matthieu Moy
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=7v62zhyp9e.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.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).