All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: "Torsten Bögershausen" <tboegi@web.de>
Subject: commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS
Date: Thu, 07 Jun 2012 13:53:50 +0200	[thread overview]
Message-ID: <4FD0964E.7040302@web.de> (raw)


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"

             reply	other threads:[~2012-06-07 11:59 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-07 11:53 Torsten Bögershausen [this message]
2012-06-07 14:20 ` commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS konglu
2012-06-07 16:14   ` Torsten Bögershausen
2012-06-07 16:40     ` konglu
2012-06-07 16:46     ` rebase [-i --exec | -ix] <CMD> Lucien Kong
2012-06-07 17:57       ` Torsten Bögershausen
2012-06-07 18:07         ` konglu
2012-06-07 19:10           ` Torsten Bögershausen
2012-06-07 19:55             ` konglu
2012-06-07 20:35               ` Andreas Schwab
2012-06-07 20:44                 ` konglu
2012-06-07 21:12                   ` Andreas Schwab
2012-06-07 20:49               ` Matthieu Moy
2012-06-07 20:59       ` Johannes Sixt
2012-06-08 15:34         ` 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=4FD0964E.7040302@web.de \
    --to=tboegi@web.de \
    --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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.