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

commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS

From
Torsten Bögershausen <tboegi@web.de>
Date
Jun 7, 2012, 11:53 UTC
Message-ID
<4FD0964E.7040302@web.de>
commit a63d7ed3017e312ddc752ac89a7d292a745d5f11
Author: Lucien Kong <Lucien.Kong@ensimag.imag.fr>
Date:   Wed Jun 6 12:34:16 2012 +0200
    rebase [-i --exec | -ix] <cmd>...
....
    Tests about this new command are also added in t3404-rebase-interactive.sh.
....
This test doesn't pass on my Mac Os box.

I run it with --debug --verbose, and it looks like another sed problem on Mac OS, may be. (My sed is /usr/bin, Mac OS X 10.6.8)

I haven't been able to dig very deep into this, but the line "sed: 1: "/^pick .*/i\t\t\t\texec gi ...": command i expects \ followed by text" looks suspicious.

Could the same be achieved by using tail instead of sed? Anybody else having this problem?

====================
ok 54 - rebase-i history with funny messages
expecting success: 
	git checkout master &&
	git checkout -b execute &&
	test_commit one_exec main.txt one_exec &&
	test_commit two_exec main.txt two_exec &&
	test_commit three_exec main.txt three_exec
Switched to branch 'master'
Switched to a new branch 'execute'
[execute 925b01e] one_exec
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+)
 create mode 100644 main.txt
[execute 7f87cbe] two_exec
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
[execute f0f177e] three_exec
 Author: A U Thor <author@example.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
ok 55 - prepare for rebase -i --exec
expecting success: 
	git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
	(
		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
		export FAKE_LINES &&
		git rebase -i HEAD~2 >expected
	) &&
	sed 1,9d expected >expect &&
	mv expect expected &&
	test_cmp expected actual

sed: 1: "/^pick .*/i\t\t\t\texec gi ...": command i expects \ followed by text Successfully rebased and updated refs/heads/execute. Successfully rebased and updated refs/heads/execute. --- expected 2012-06-07 11:46:53.000000000 +0000 +++ actual 2012-06-07 11:46:52.000000000 +0000

@@ -1,18 +1,4 @@
-Rebasing (2/4)
Executing: git show HEAD
-commit 8f99a4f1fbbd214b25a070ad34ec5a8f833522cc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
-
-    E
-
-diff --git a/file3 b/file3
-new file mode 100644
-index 0000000..1c50726
---- /dev/null
-+++ b/file3
-@@ -0,0 +1 @@
-+E
-Rebasing (3/4)
Rebasing (4/4)
Executing: git show HEAD
+Rebasing (1/1)
Executing: git show HEAD
 commit 925b01e149bd188d43f972ad86d1e4d6611c8fa0
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 16:10:13 2005 -0700
not ok - 56 running "git rebase -i --exec git show HEAD"
Next: konglu@minatec.inpg.fr
Message 1 of 15 in “commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS”
  1. Torsten BögershausenJun 7, 2012
  2. konglu@minatec.inpg.frJun 7, 2012
  3. Torsten BögershausenJun 7, 2012
  4. konglu@minatec.inpg.frJun 7, 2012
  5. rebase [-i --exec | -ix] <CMD>...Lucien Kong, Jun 7, 2012
  6. Torsten BögershausenJun 7, 2012
  7. konglu@minatec.inpg.frJun 7, 2012
  8. Torsten BögershausenJun 7, 2012
  9. konglu@minatec.inpg.frJun 7, 2012
  10. Andreas SchwabJun 7, 2012
  11. konglu@minatec.inpg.frJun 7, 2012
  12. Andreas SchwabJun 7, 2012
  13. Matthieu MoyJun 7, 2012
  14. Johannes SixtJun 7, 2012
  15. Junio C HamanoJun 8, 2012

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.