{"thread":{"id":"39025","subject":"Followup: Managing EXCEL with git - diff problem.","startedAt":"2015-04-07T12:55:11Z","lastAt":"2015-04-07T13:26:28Z","messageCount":2,"participants":["Randall S. Becker","John Keeping"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"259124","messageId":"02d801d07132$159f76a0$40de63e0$@nexbridge.com","threadId":"39025","inReplyTo":null,"subject":"Followup: Managing EXCEL with git - diff problem.","fromName":"Randall S. Becker","fromEmail":"rsbecker@nexbridge.com","sentAt":"2015-04-07T12:55:11Z","receivedAt":"2015-04-07T12:55:11Z","isPatch":false,"sender":{"key":"randall.becker@nexbridge.ca","avatar":"https://avatars.githubusercontent.com/u/28956764?v=4"},"body":"Hi all,\n\nThere was a discussion a while back on how to manage EXCEL content in git.\nThis involved a simple trick of modifying the file extension from .xlsx to\n.zip and unpacking the file - resulting in a whole bunch of XML files. Git\nis happy with that part and the content can be managed - slightly.\n\nUnfortunately, EXCEL stores its XML content in single lines. Git has no\nproblem with that either, as far as managing the content, but the lines can\nbe really long. However, after about 20K in size, while the config:\n\n\talias.wdiff=diff --color-words\n\nThe ability of git to report differences goes away - as in no output from\ngit diff. This occurs on Windows and Linux under git 2.3.3 and git 2.3.0.\nI'm not sure whether this is a user error, a usage error, or an actual\nproblem.\n\nI had originally raised this as a SourceTree problem figuring it might be\nthere: https://jira.atlassian.com/browse/SRCTREEWIN-3145\n\nAny advice (preferably no teasing - :-) - I am considering smudging but\nwould rather avoid that)?\n\nCheers,\nRandall\n\n-- Brief whoami: NonStop&UNIX developer since approximately\nUNIX(421664400)/NonStop(211288444200000000)\n-- In my real life, I talk too much.\n"},{"id":"259126","messageId":"20150407132628.GI21452@serenity.lan","threadId":"39025","inReplyTo":"02d801d07132$159f76a0$40de63e0$@nexbridge.com","subject":"Re: Followup: Managing EXCEL with git - diff problem.","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2015-04-07T13:26:28Z","receivedAt":"2015-04-07T13:26:28Z","isPatch":false,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"On Tue, Apr 07, 2015 at 08:55:11AM -0400, Randall S. Becker wrote:\n> There was a discussion a while back on how to manage EXCEL content in git.\n> This involved a simple trick of modifying the file extension from .xlsx to\n> .zip and unpacking the file - resulting in a whole bunch of XML files. Git\n> is happy with that part and the content can be managed - slightly.\n> \n> Unfortunately, EXCEL stores its XML content in single lines. Git has no\n> problem with that either, as far as managing the content, but the lines can\n> be really long. However, after about 20K in size, while the config:\n> \n> \talias.wdiff=diff --color-words\n> \n> The ability of git to report differences goes away - as in no output from\n> git diff. This occurs on Windows and Linux under git 2.3.3 and git 2.3.0.\n> I'm not sure whether this is a user error, a usage error, or an actual\n> problem.\n> \n> I had originally raised this as a SourceTree problem figuring it might be\n> there: https://jira.atlassian.com/browse/SRCTREEWIN-3145\n> \n> Any advice (preferably no teasing - :-) - I am considering smudging but\n> would rather avoid that)?\n\nPerhaps try defining a specific diff driver for these files (see\ngit-attributes(5)).  There is an xmldiff program [0] that might be able\nto generate more useful diffs.\n\n[0] http://www.logilab.org/project/xmldiff\n"}]}