Re: rebase [-i --exec | -ix] <CMD>...

From: Torsten Bögershausen <tboegi@web.de>
Date: Jun 7, 2012, 19:10 UTC
Message-ID: <4FD0FCAC.3070408@web.de>
In-Reply-To: <20120607200731.Horde.xzrpWHwdC4BP0O3jZ46SyWA@webmail.minatec.grenoble-inp.fr>

On 07.06.12 20:07, konglu@minatec.inpg.fr wrote:

Show 6 quoted lines

> 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]