threads / patch / 20781

patchRemove unused t/t8005/iso8859-5.txt file

Subject: [PATCH] Remove unused t/t8005/iso8859-5.txt file

## tl;dr

4 messages between Aug 29, 2009 and Aug 30, 2009. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Nanako Shiraishi· Aug 29, 2009, 07:16 UTC · lore

This file is no longer used since commit 54bc13c.

Signed-off-by: �����钤���� ��ʒ�ʒ�� <nanako3@lavabit.com>
---
 t/t8005/iso8859-5.txt |  Bin 74 -> 0 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 t/t8005/iso8859-5.txt

Show changes to t/t8005/iso8859-5.txt +0 −0

diff --git a/t/t8005/iso8859-5.txt b/t/t8005/iso8859-5.txt
deleted file mode 100644
index 2e4b80c8df4da30722561049c46cca778e49cd2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74
zcmeYa_P4MwwTw57_jB}hwN=`2>B3!w{Z}77xOeHsbA^L9uG|B%l(;<M%6x;}ZIupP
Zefa3!rF&Nu9^Sim@#WRKH?Asi0RTCvCqV!J

-- 
1.6.4.1

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Junio C Hamano· Aug 29, 2009, 07:48 UTC · re: Nanako Shiraishi · lore

Re: [PATCH] Remove unused t/t8005/iso8859-5.txt file

Nanako Shiraishi <nanako3@lavabit.com> writes:

> This file is no longer used since commit 54bc13c.

Hmm, the patch is grossly encoding damaged, so I'll hand apply. Out of curiosity, how did you find this?

Nanako Shiraishi· Aug 29, 2009, 08:08 UTC · re: Junio C Hamano · lore

Re: [PATCH] Remove unused t/t8005/iso8859-5.txt file

Quoting Junio C Hamano <gitster@pobox.com>

> Out of curiosity, how did you find this?

Soon after you posted your original in http://thread.gmane.org/gmane.comp.version-control.git/121881, I applied it to my tree, and I have been running 'git pull --rebase' for ever. I noticed that rebase didn't remove the commit, even after your 54bc13c.

Today I found that the rebased patch only removed that file. The real question is how you lost the deletion of the file when you applied. What happened?

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

Junio C Hamano· Aug 30, 2009, 20:14 UTC · re: Nanako Shiraishi · lore

Re: [PATCH] Remove unused t/t8005/iso8859-5.txt file

Nanako Shiraishi <nanako3@lavabit.com> writes:

Show 12 quoted lines

> Quoting Junio C Hamano <gitster@pobox.com>
>
>> Out of curiosity, how did you find this?
>
> Soon after you posted your original in
> http://thread.gmane.org/gmane.comp.version-control.git/121881, I applied
> it to my tree, and I have been running 'git pull --rebase' for ever. I
> noticed that rebase didn't remove the commit, even after your 54bc13c.
>
> Today I found that the rebased patch only removed that file. The real
> question is how you lost the deletion of the file when you applied. What
> happened?

My stupidity, and a little bit of danger in trusting "am -3" blindly.

The patch sent to the list was against the master, but the actual commit created, 54bc13c, was on maint. Back then, there was a commit in master but not in maint that stopped using cp1251.txt and started using iso8859-5.txt instead.

Because maint did not have iso8859-5.txt (which the patch wanted to remove), when "am -3" did its fake 3-way merge, the removal of the path did not even conflict. It was the case of "neither side wants to have this file". As the result, cp1251.txt was left in the tree (which is half-Ok, even though the updated test never looked at it anymore), and merging the result back to master did not touch iso8859-5.txt.