From: "Torsten Bögershausen" <tboegi@web.de>
To: konglu@minatec.inpg.fr
Cc: "Torsten Bögershausen" <tboegi@web.de>,
"Lucien Kong" <Lucien.Kong@ensimag.imag.fr>,
git@vger.kernel.org
Subject: Re: rebase [-i --exec | -ix] <CMD>...
Date: Thu, 07 Jun 2012 21:10:36 +0200 [thread overview]
Message-ID: <4FD0FCAC.3070408@web.de> (raw)
In-Reply-To: <20120607200731.Horde.xzrpWHwdC4BP0O3jZ46SyWA@webmail.minatec.grenoble-inp.fr>
On 07.06.12 20:07, konglu@minatec.inpg.fr wrote:
> On which branch are you applying the patch ? It should works on
> branch master (it works for me) but it won't on branch "pu", as
> it has already been queued.
>
> Lucien Kong
>
Thanks, now the patch applies on master.
But it seems that the problem is still there:
================
[snip]
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\exec git s ...": extra characters after \ at the end of i command
Successfully rebased and updated refs/heads/execute.
Successfully rebased and updated refs/heads/execute.
--- expected 2012-06-07 19:07:51.000000000 +0000
+++ actual 2012-06-07 19:07:50.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"
[snip]
next prev parent reply other threads:[~2012-06-07 19:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-07 11:53 commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS Torsten Bögershausen
2012-06-07 14:20 ` 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 [this message]
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
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=4FD0FCAC.3070408@web.de \
--to=tboegi@web.de \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=konglu@minatec.inpg.fr \
/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).