[PATCH] lib-rebase: document exec_ in FAKE_LINES

[PATCH] lib-rebase: document exec_ in FAKE_LINES

[Andrew Pimlott]

Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
---
 t/lib-rebase.sh |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index cfd3409..7f119e2 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -17,6 +17,8 @@
 #       ("squash", "fixup", "edit", or "reword") and the SHA1 taken
 #       from the specified line.
 #
+#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#
 #   "#" -- Add a comment line.
 #
 #   ">" -- Add a blank line.
-- 
1.7.10.4

[PATCH] t7500: fix flipped actual/expect

[Andrew Pimlott]

Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
---
 t/t7500-commit.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 436b7b6..e166ac8 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -13,8 +13,8 @@ commit_msg_is () {
 	expect=commit_msg_is.expect
 	actual=commit_msg_is.actual
 
-	printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect &&
-	printf "%s" "$1" >$actual &&
+	printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
+	printf "%s" "$1" >$expect &&
 	test_i18ncmp $expect $actual
 }
 
-- 
1.7.10.4

Re: [PATCH] t7500: fix flipped actual/expect

[Junio C Hamano]

Andrew Pimlott <andrew@pimlott.net> writes:

> Signed-off-by: Andrew Pimlott <andrew@pimlott.net>
> ---
>  t/t7500-commit.sh |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
> index 436b7b6..e166ac8 100755
> --- a/t/t7500-commit.sh
> +++ b/t/t7500-commit.sh
> @@ -13,8 +13,8 @@ commit_msg_is () {
>  	expect=commit_msg_is.expect
>  	actual=commit_msg_is.actual
>  
> -	printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect &&
> -	printf "%s" "$1" >$actual &&
> +	printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
> +	printf "%s" "$1" >$expect &&
>  	test_i18ncmp $expect $actual
>  }

Wow.  How could all of us missed this for a long time?

Thanks, the change obviously looks good.

Re: [PATCH] t7500: fix flipped actual/expect

[Andrew Pimlott]

Excerpts from Junio C Hamano's message of Mon Jul 01 09:52:05 -0700 2013:
> Wow.  How could all of us missed this for a long time?

:-)  I don't know, but little is more frustrating than a misleading
diagnostic.

BTW, I didn't expect git-send-email to send those two messages in a
thread.  I'll keep them separate next time.

Andrew