{"thread":{"id":"4617","subject":"libxdiff patches","startedAt":"2006-06-22T18:57:57Z","lastAt":"2006-06-22T18:57:57Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"22289","messageId":"7vejxhm30q.fsf@assigned-by-dhcp.cox.net","threadId":"4617","inReplyTo":null,"subject":"libxdiff patches","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-22T18:57:57Z","receivedAt":"2006-06-22T18:57:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I'm sending three patches that should apply cleanly on top of\nlibxdiff 0.21; we use the first two with the copy of\nlibxdiff/xdiff as built-in difff generator in git.\n\nThe first patch is to add an option to emit function names in\nthe hunk headers, by Mark Wooding.  I think this is a good\naddition to the upstream libxdiff itself.\n\nThe second one is to squelch compilation warnings on (seemingly)\nuninitialized variables, by Marco Roeland.  You have already\nexplained on the git list that these warnings are harmless (IOW\nthe compiler is being stupid), but squelching these warnings\nwould help spot other real problems.\n\nThe primary reason I am sending these to you is to keep the\nchanges between your version and the copy git uses to the\nminimum, so we can keep up with your future updates.  Right\nnow, the differences are mostly that the copy git uses is\nstripped down (generalization like s_memallocator and s_mmblock\nare not used in our copy, for example), and these two patches\nare the only real additions we have.\n\nThe third patch, by Johannes Schindelin, teaches whitespaces to\nxdiff: -b (--ignore-space-change) and -w (--ignore-all-space).\nI haven't merged this into the mainline of git yet.  If you are\ninterested in adding this to upstream (I think it would be a\ngood addition -- sanity checking is appreciated, though), and if\nyou are going to do that slightly or majorly differently, I\nwould prefer to use the change from upstream in order to avoid\ncarrying git-only local changes in my tree.\n"}]}