t3702-add-edit.sh failure in next

t3702-add-edit.sh failure in next

[Mike Ralphson]

I'm seeing a reproducible failure in t3702 on AIX 5.3, shell set to
bash (v2.05b)

The 'test_cmp orig-patch expected-patch' is seeing this diff:

2c2
< index b9834b5..52aff4c 100644
---
> index b9834b5..0b8f197 100644

The index seems to contain the expected content.

I've tried to eliminate GIT* environment variables which might be
affecting the commit id, and tried adding extra test_ticks, but I'm
afraid I can't work out what's up here.

Normally all tests pass fine with the exception of some skipped
because of known iconv issues on this platform.

Mike

Re: t3702-add-edit.sh failure in next

[Johannes Schindelin]

Hi,

On Mon, 27 Apr 2009, Mike Ralphson wrote:

> I'm seeing a reproducible failure in t3702 on AIX 5.3, shell set to
> bash (v2.05b)
> 
> The 'test_cmp orig-patch expected-patch' is seeing this diff:
> 
> 2c2
> < index b9834b5..52aff4c 100644
> ---
> > index b9834b5..0b8f197 100644

Could you send me the output of

	cd t/trash\ directory.t3702* &&
	git show 0b8f197 > file.txt

?

Thanks,
Dscho

Re: t3702-add-edit.sh failure in next

[Mike Ralphson]

[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]

2009/4/27 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> On Mon, 27 Apr 2009, Mike Ralphson wrote:
>> I'm seeing a reproducible failure in t3702 on AIX 5.3, shell set to
>> bash (v2.05b)
>>
>> The 'test_cmp orig-patch expected-patch' is seeing this diff:
>>
>> 2c2
>> < index b9834b5..52aff4c 100644
>> ---
>> > index b9834b5..0b8f197 100644
>
> Could you send me the output of
>
>        cd t/trash\ directory.t3702* &&
>        git show 0b8f197 > file.txt

Well I would, but there isn't any. It's an unknown revision. git fsck
-v doesn't show it anywhere. I have:

Checking HEAD link
Checking object directory
Checking directory .git/objects/91
Checking directory .git/objects/b9
Checking directory .git/objects/e0
Checking directory .git/objects/ef
Checking tree 911cd8fe32ce30bdaee8753cd526394a5c878cc0
Checking blob b9834b51dd31af09b373c39cae5c5fce38ee1034
Checking commit e055285ca8312c5bd9f369a5762fb5871ad110e8
Checking blob ef6e94c5794cbad5c1dc41bec85640ca54a46a55
Checking reflog
0000000000000000000000000000000000000000->e055285ca8312c5bd9f369a5762fb5871ad110e8
Checking reflog
0000000000000000000000000000000000000000->e055285ca8312c5bd9f369a5762fb5871ad110e8
Checking connectivity (32 objects)
Checking ef6e94c5794cbad5c1dc41bec85640ca54a46a55
Checking b9834b51dd31af09b373c39cae5c5fce38ee1034
Checking e055285ca8312c5bd9f369a5762fb5871ad110e8
Checking 911cd8fe32ce30bdaee8753cd526394a5c878cc0

blob, tree and commit of 'initial' I believe plus the new blob of the
expected content in ef6e94c (attached).

I've just tried building without INTERNAL_QSORT just in case, and it
doesn't seem to be that.

Mike

[-- Attachment #2: ef6e94c5.txt --]
[-- Type: text/plain, Size: 469 bytes --]

LO, praise of the prowess of people-kings
of spear-armed Danes, in days long sped,
we have heard, and what honor the athelings won!

Oft Scyld the Scefing from squadroned foes,
from many a tribe, the mead-bench tore,
awing the earls. Since erst he lay
friendless, a foundling, fate repaid him:

for he waxed under welkin, in wealth he throve,
till before him the folk, both far and near,
who house by the whale-path, heard his mandate,
gave him gifts:  a good king he!

[PATCH] t3702: fix reliance on SHELL_PATH being '/bin/sh'

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2918 bytes --]


Trying to be lazy and comparing files with fake-editor.sh to avoid
having to provide another example text does not work well: the blob
name changes when SHELL_PATH changes, and so does the 'index' line
in the diff.

Therefore provide a second example text.

Noticed by Mike Ralphson.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	On Mon, 27 Apr 2009, Mike Ralphson wrote:

	> 2009/4/27 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
	> > On Mon, 27 Apr 2009, Mike Ralphson wrote:
	> >> I'm seeing a reproducible failure in t3702 on AIX 5.3, shell set to
	> >> bash (v2.05b)
	> >>
	> >> The 'test_cmp orig-patch expected-patch' is seeing this diff:
	> >>
	> >> 2c2
	> >> < index b9834b5..52aff4c 100644
	> >> ---
	> >> > index b9834b5..0b8f197 100644
	> >
	> > Could you send me the output of
	> >
	> >        cd t/trash\ directory.t3702* &&
	> >        git show 0b8f197 > file.txt

	Aargh.

	I know what it is.  Sorry, _very_ stupid thinko on this side of 
	the ocean.

	Time for a day off.

 t/t3702-add-edit.sh |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh
index 7262786..4ee47cc 100755
--- a/t/t3702-add-edit.sh
+++ b/t/t3702-add-edit.sh
@@ -21,6 +21,15 @@ who house by the whale-path, heard his mandate,
 gave him gifts:  a good king he!
 EOF
 
+cat > second-part << EOF
+To him an heir was afterward born,
+a son in his halls, whom heaven sent
+to favor the folk, feeling their woe
+that erst they had lacked an earl for leader
+so long a while; the Lord endowed him,
+the Wielder of Wonder, with world's renown.
+EOF
+
 test_expect_success 'setup' '
 
 	git add file &&
@@ -31,10 +40,10 @@ test_expect_success 'setup' '
 
 cat > expected-patch << EOF
 diff --git a/file b/file
-index b9834b5..0b8f197 100644
+index b9834b5..9020acb 100644
 --- a/file
 +++ b/file
-@@ -1,11 +1,3 @@
+@@ -1,11 +1,6 @@
 -LO, praise of the prowess of people-kings
 -of spear-armed Danes, in days long sped,
 -we have heard, and what honor the athelings won!
@@ -46,9 +55,12 @@ index b9834b5..0b8f197 100644
 -till before him the folk, both far and near,
 -who house by the whale-path, heard his mandate,
 -gave him gifts:  a good king he!
-+#!$SHELL_PATH
-+mv -f "\$1" orig-patch &&
-+mv -f patch "\$1"
++To him an heir was afterward born,
++a son in his halls, whom heaven sent
++to favor the folk, feeling their woe
++that erst they had lacked an earl for leader
++so long a while; the Lord endowed him,
++the Wielder of Wonder, with world's renown.
 EOF
 
 cat > patch << EOF
@@ -97,9 +109,9 @@ chmod a+x fake-editor.sh
 
 test_expect_success 'add -e' '
 
-	cp fake-editor.sh file &&
+	cp second-part file &&
 	git add -e &&
-	test_cmp fake-editor.sh file &&
+	test_cmp second-part file &&
 	test_cmp orig-patch expected-patch &&
 	git diff --cached > out &&
 	test_cmp out expected
-- 
1.6.2.1.493.g67cf3

Re: [PATCH] t3702: fix reliance on SHELL_PATH being '/bin/sh'

[Mike Ralphson]

2009/4/27 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> Trying to be lazy and comparing files with fake-editor.sh to avoid
> having to provide another example text does not work well: the blob
> name changes when SHELL_PATH changes, and so does the 'index' line
> in the diff.
>
>        Aargh.
>
>        I know what it is.  Sorry, _very_ stupid thinko on this side of
>        the ocean.
>
>        Time for a day off.

I shall merely extend my thanks for diagnosing the problem (which I
should have been able to do), and for fixing it - which I wouldn't
have been able to do, because I'd assumed you were trying to be
clever, not lazy. 8-)

Tested-by: Mike Ralphson <mike@abacus.co.uk>