{"thread":{"id":"606","subject":"[PATCH 0/3] diff overhaul","startedAt":"2005-05-14T01:39:24Z","lastAt":"2005-05-14T16:36:22Z","messageCount":5,"participants":["Junio C Hamano","Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"3273","messageId":"7vk6m260xf.fsf@assigned-by-dhcp.cox.net","threadId":"606","inReplyTo":null,"subject":"[PATCH 0/3] diff overhaul","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-14T01:39:24Z","receivedAt":"2005-05-14T01:39:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are three patches to update diff we discussed earlier.\n\n [PATCH 1/3] Update mode-change strings in diff output.\n [PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.\n [PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).\n\nThe first one is to normalize the mode bits output to be more\nmachine friendly, which we discussed.\n\nThe second commit records only renames for two files and there\nis no content change. The third one is to change the Makefiles,\ndocumentation, and also usage string in git-diff-helper itself.\n\nI am deliverately doing the 2 and 3 in separate steps for two\nreasons. (1) to reduce the possibility of mistakes during the\nrename for myself; (2) people doing the git repository browser\ncan use the commit trail for practicing their rename detection\nlogic. So please keep these two steps separate when you commit.\n\n"},{"id":"3314","messageId":"20050514151159.GL3905@pasky.ji.cz","threadId":"606","inReplyTo":"7vk6m260xf.fsf@assigned-by-dhcp.cox.net","subject":"Rename tracking","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-14T15:11:59Z","receivedAt":"2005-05-14T15:11:59Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, May 14, 2005 at 03:39:24AM CEST, I got a letter\nwhere Junio C Hamano told me that...\n> Here are three patches to update diff we discussed earlier.\n> \n> [PATCH 1/3] Update mode-change strings in diff output.\n> [PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.\n> [PATCH 3/3] Rename git-diff-tree-helper to git-diff-helper (part 2).\n> \n> The first one is to normalize the mode bits output to be more\n> machine friendly, which we discussed.\n\nI'll postpone it for another while since there is still some discussion\nabout tuning the output.\n\n> The second commit records only renames for two files and there\n> is no content change. The third one is to change the Makefiles,\n> documentation, and also usage string in git-diff-helper itself.\n> \n> I am deliverately doing the 2 and 3 in separate steps for two\n> reasons. (1) to reduce the possibility of mistakes during the\n> rename for myself; (2) people doing the git repository browser\n> can use the commit trail for practicing their rename detection\n> logic. So please keep these two steps separate when you commit.\n\nI buy that it is nice for now to keep the changes to the renamed files\nseparate, but I don't see why should I withhold changing other files\nin parallel with the rename.\n\nBut I think we really need explicit rename tracking, since this really\nsucks. And even if someone would written a hyperintelligent content\nmoves heuristic tracker, it would be horribly slow on longer distances,\nand more importantly it could still be confused when renaming several\nsimilar or same files in parallel.\n\nI'm thinking about using \"\\n---\\n\\n\" in commit message to separate some\n\"internal data\" like this. cg-log (and web interfaces and other\ntoolkits, if we get to agree on something common) could then by default\nhide it. Below it would contain something which we could hopefully embed\nin patches too (actually less work for extracting patches by cg-mkpatch\nor similar tools). What do you think?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"3325","messageId":"7v4qd523p1.fsf@assigned-by-dhcp.cox.net","threadId":"606","inReplyTo":"20050514151159.GL3905@pasky.ji.cz","subject":"Re: Rename tracking","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-14T16:05:30Z","receivedAt":"2005-05-14T16:05:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":">>>>> \"PB\" == Petr Baudis writes:\n\nPB> I'll postpone it for another while since there is still some discussion\nPB> about tuning the output.\n\nWhat discussion did I miss???\n\nPB> I'm thinking about using \"\\n---\\n\\n\" in commit message to separate some\nPB> \"internal data\" like this. cg-log (and web interfaces and other\nPB> toolkits, if we get to agree on something common) could then by default\nPB> hide it. Below it would contain something which we could hopefully embed\nPB> in patches too (actually less work for extracting patches by cg-mkpatch\nPB> or similar tools). What do you think?\n\nSince I have not been particularly interested in rename tracking\n(because I myself personally have not felt the need for it), I\ndo not offhand have much idea worth to offer. Sorry.\n\n"},{"id":"3327","messageId":"20050514162133.GW3905@pasky.ji.cz","threadId":"606","inReplyTo":"7v4qd523p1.fsf@assigned-by-dhcp.cox.net","subject":"Re: Rename tracking","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-05-14T16:21:33Z","receivedAt":"2005-05-14T16:21:33Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sat, May 14, 2005 at 06:05:30PM CEST, I got a letter\nwhere Junio C Hamano told me that...\n> >>>>> \"PB\" == Petr Baudis writes:\n> \n> PB> I'll postpone it for another while since there is still some discussion\n> PB> about tuning the output.\n> \n> What discussion did I miss???\n\nMainly\n\nFrom: Petr Baudis \nDate: Sat, 14 May 2005 17:03:56 +0200\nSubject: Re: [PATCH] Resurrect diff-tree-helper -R\nMessage-ID: <20050514150356.GK3905@pasky.ji.cz>\n\n> PB> I'm thinking about using \"\\n---\\n\\n\" in commit message to separate some\n> PB> \"internal data\" like this. cg-log (and web interfaces and other\n> PB> toolkits, if we get to agree on something common) could then by default\n> PB> hide it. Below it would contain something which we could hopefully embed\n> PB> in patches too (actually less work for extracting patches by cg-mkpatch\n> PB> or similar tools). What do you think?\n> \n> Since I have not been particularly interested in rename tracking\n> (because I myself personally have not felt the need for it), I\n> do not offhand have much idea worth to offer. Sorry.\n\nWell, I'd say that with those renaming patches we are feeling the need\nfor it?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"3329","messageId":"7vfywpzrw9.fsf@assigned-by-dhcp.cox.net","threadId":"606","inReplyTo":"20050514162133.GW3905@pasky.ji.cz","subject":"Re: Rename tracking","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-05-14T16:36:22Z","receivedAt":"2005-05-14T16:36:22Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":">>>>> \"PB\" == Petr Baudis writes:\n\nPB> Well, I'd say that with those renaming patches we are feeling the need\nPB> for it?\n\nAgain, not me. What I did (and asked you to do) was to help\n_others_ who are interested in rename tracking, not me. Find\nthe following message in the archive if you want to know why I\nam not in urgent need for rename tracking.\n\n To:\tLinus Torvalds \n Cc:\tDavid Greaves , git@vger.kernel.org\n Subject: GIT blame (was Re: Quick command reference)\n From:\tJunio C Hamano \n Date:\tFri, 06 May 2005 02:32:30 -0700\n X-Mailing-List:\tgit@vger.kernel.org\n\n >>>>> I == Junio C Hamano said:\n\n JCH> Linus, please pull from git-jc.git archive at:\n JCH> http://members.cox.net/junkio/git-jc.git/\n\n Since that message I have added a couple more commits there.\n One of the things is a backport of -t (tag) flag to git-ls-files\n from Cogito fork.\n\n The reason I am writing this message is not because I am excited\n about the backport [*1*], but because I find it quite cool the\n way I found out which commit in Pasky's development line\n introduced the change. It demonstrates your previous \"renames\n does not matter when doing CVS blame\" argument actually works.\n\n Here is what I did: ... (the rest omitted) ...\n\n"}]}