git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 08/10] replace: add tests for --edit

From
Jeff King <peff@peff.net>
Date
May 17, 2014, 07:14 UTC
Message-ID
<20140517071410.GE13003@sigill.intra.peff.net>
In-Reply-To
<20140517064133.18932.74476.chriscool@tuxfamily.org>
On Sat, May 17, 2014 at 08:41:30AM +0200, Christian Couder wrote:
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
>  t/t6050-replace.sh | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
Yay, tests.
Show 8 quoted lines
> +test_expect_success 'setup a fake editor' '
> +	cat >fakeeditor <<-\EOF &&
> +		#!/bin/sh
> +		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
> +		mv "$1.new" "$1"
> +	EOF
> +	chmod +x fakeeditor
> +'
Please use write_script, like:
  test_expect_success 'setup a fake editor' '
	write_script fakeeditor <<-\EOF
		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
		mv "$1.new" "$1"
	EOF
  '

which will use the $(SHELL_PATH) shebang. It doesn't matter for such a simple script here (which even a broken #!/bin/sh could manage), but in general, I think we're trying to set it consistently.

You could also &&-chain the commands in your fakeeditor script, though I find it unlikely that sed will fail.

> +test_expect_success '--edit with and without already replaced object' '
> +	GIT_EDITOR=./fakeeditor test_must_fail git replace --edit "$PARA3" &&

Unfortunately it's not portable to do a one-shot environment variable on a shell function like this; some shells leave the variable set after the function returns. We've been using:

  test_must_fail env GIT_EDITOR=./fakeeditor git ...
The regular
  GIT_EDITOR=./fakeeditor git ...
ones are OK.
-Peff
Previous: Christian CouderNext: Christian Couder
Message 12 of 16 in “replace: add option to edit a Git object”
  1. 00/10 replace: add option to edit a Git objectChristian Couder, May 17, 2014
  2. 01/10 replace: refactor command-mode determinationChristian Couder, May 17, 2014
  3. 02/10 replace: use OPT_CMDMODE to handle modesChristian Couder, May 17, 2014
  4. 03/10 replace: factor object resolution out of replace_objectChristian Couder, May 17, 2014
  5. 04/10 replace: add --edit optionChristian Couder, May 17, 2014
  6. 05/10 replace: make sure --edit results in a different objectChristian Couder, May 17, 2014
  7. Jeff KingMay 17, 2014
  8. 06/10 replace: refactor checking ref validityChristian Couder, May 17, 2014
  9. 07/10 replace: die early if replace ref already existsChristian Couder, May 17, 2014
  10. Jeff KingMay 17, 2014
  11. 08/10 replace: add tests for --editChristian Couder, May 17, 2014
  12. Jeff KingMay 17, 2014
  13. 09/10 replace: add --edit to usage stringChristian Couder, May 17, 2014
  14. 10/10 Documentation: replace: describe new --edit optionChristian Couder, May 17, 2014
  15. Jeff KingMay 17, 2014
  16. Jeff KingMay 17, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.