{"thread":{"id":"8081","subject":"[RFC] gitk using diff-tree -M for merges","startedAt":"2007-05-11T08:45:56Z","lastAt":"2007-05-11T08:45:56Z","messageCount":1,"participants":["Uwe Kleine-König"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"41820","messageId":"20070511084556.GB5485@informatik.uni-freiburg.de","threadId":"8081","inReplyTo":null,"subject":"[RFC] gitk using diff-tree -M for merges","fromName":"Uwe Kleine-König","fromEmail":"ukleinek@informatik.uni-freiburg.de","sentAt":"2007-05-11T08:45:56Z","receivedAt":"2007-05-11T08:45:56Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hello,\n\nlooking at the diff that commit 070739fd351702ea9bb4f65595728ae25a488075\nintroduced with gitk from 1.5.2-rc3 [1], I'd prefer gitk using the\noption -M for diff-tree to detect that in 3f28f63f git-gui.sh exists,\ntoo.  Currently the diff is a bit longer that the whole file, with -M it\nwould be empty.\n\nProbably using -M hurts performance, so it should better be a config\noption?\n\nBelow is a patch that hardcodes -M, I didn't check if there are more\nplaces where it should be added.\n\nWhat do you think?\n\nBest regards\nUwe\n\n[1] the following is a nice view:\n\n\tgitk 070739fd351702ea9bb4f65595728ae25a488075 ^53a58245863eff3d70aaa3ac75d7d57e843fc91d^ ^e701ccc3883959b4ba5fada7a903e8e9eaddcba7\n\ndiff --git a/gitk b/gitk\nindex a57e84c..bcc4637 100755\n--- a/gitk\n+++ b/gitk\n@@ -4240,7 +4240,7 @@ proc mergediff {id l} {\n     set diffids $id\n     # this doesn't seem to actually affect anything...\n     set env(GIT_DIFF_OPTS) $diffopts\n-    set cmd [concat | git diff-tree --no-commit-id --cc $id]\n+    set cmd [concat | git diff-tree -M --no-commit-id --cc $id]\n     if {[catch {set mdf [open $cmd r]} err]} {\n \terror_popup \"Error getting merge diffs: $err\"\n \treturn\n\n-- \nUwe Kleine-König\n\nhttp://www.google.com/search?q=1+electron+mass%3D\n"}]}