{"thread":{"id":"20781","subject":"[PATCH] Remove unused t/t8005/iso8859-5.txt file","startedAt":"2009-08-29T07:16:37Z","lastAt":"2009-08-30T20:14:38Z","messageCount":4,"participants":["Nanako Shiraishi","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122078","messageId":"20090829161637.6117@nanako3.lavabit.com","threadId":"20781","inReplyTo":null,"subject":"[PATCH] Remove unused t/t8005/iso8859-5.txt file","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-08-29T07:16:37Z","receivedAt":"2009-08-29T07:16:37Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"This file is no longer used since commit 54bc13c.\n\nSigned-off-by: �����钤���� ��ʒ�ʒ�� \n---\n t/t8005/iso8859-5.txt | Bin 74 -> 0 bytes\n 1 files changed, 0 insertions(+), 0 deletions(-)\n delete mode 100644 t/t8005/iso8859-5.txt\n\ndiff --git a/t/t8005/iso8859-5.txt b/t/t8005/iso8859-5.txt\ndeleted file mode 100644\nindex 2e4b80c8df4da30722561049c46cca778e49cd2f..0000000000000000000000000000000000000000\nGIT binary patch\nliteral 0\nHcmV?d00001\n\nliteral 74\nzcmeYa_P4MwwTw57_jB}hwN=`2>B3!w{Z}77xOeHsbA^L9uG|B%l(; writes:\n\n> This file is no longer used since commit 54bc13c.\n\nHmm, the patch is grossly encoding damaged, so I'll hand apply.\nOut of curiosity, how did you find this?\n"},{"id":"122082","messageId":"20090829170809.6117@nanako3.lavabit.com","threadId":"20781","inReplyTo":"7vy6p3giwf.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Remove unused t/t8005/iso8859-5.txt file","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-08-29T08:08:09Z","receivedAt":"2009-08-29T08:08:09Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Junio C Hamano \n\n> Out of curiosity, how did you find this?\n\nSoon 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.\n\nToday 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?\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"122131","messageId":"7v3a79dpox.fsf@alter.siamese.dyndns.org","threadId":"20781","inReplyTo":"20090829170809.6117@nanako3.lavabit.com","subject":"Re: [PATCH] Remove unused t/t8005/iso8859-5.txt file","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-30T20:14:38Z","receivedAt":"2009-08-30T20:14:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Quoting Junio C Hamano \n>\n>> Out of curiosity, how did you find this?\n>\n> Soon after you posted your original in\n> http://thread.gmane.org/gmane.comp.version-control.git/121881, I applied\n> it to my tree, and I have been running 'git pull --rebase' for ever. I\n> noticed that rebase didn't remove the commit, even after your 54bc13c.\n>\n> Today I found that the rebased patch only removed that file. The real\n> question is how you lost the deletion of the file when you applied. What\n> happened?\n\nMy stupidity, and a little bit of danger in trusting \"am -3\" blindly.\n\nThe patch sent to the list was against the master, but the actual commit\ncreated, 54bc13c, was on maint. Back then, there was a commit in master\nbut not in maint that stopped using cp1251.txt and started using\niso8859-5.txt instead.\n\nBecause maint did not have iso8859-5.txt (which the patch wanted to\nremove), when \"am -3\" did its fake 3-way merge, the removal of the path\ndid not even conflict. It was the case of \"neither side wants to have\nthis file\". As the result, cp1251.txt was left in the tree (which is\nhalf-Ok, even though the updated test never looked at it anymore), and\nmerging the result back to master did not touch iso8859-5.txt.\n"}]}