From: David Lang Date: Tue, 16 Aug 2016 16:48:39 GMT Subject: Re: Working with zip files Message-ID: In-Reply-To: <87shu4wu6o.fsf@thinkpad.rath.org> On Tue, 16 Aug 2016, Nikolaus Rath wrote: > On Aug 16 2016, David Lang wrote: >> On Tue, 16 Aug 2016, Nikolaus Rath wrote: >> >>> I would like to store Simulink models in a Git >>> repository. Unfortunately, the file format is binary. But luckily, the >>> binary format happens to be a zipfile containing nicely formatted XML >>> files. >>> >>> Is there a way to teach Git to take advantage of this when storing, >>> diff-ing and merging these files? >> >> you should be able to use clean/smudge to have git store the files >> uncompressed, which will help a lot. > > Cool, I'll look into that. > >> I think there's a way to tell it to do a xml aware diff/patch, but I >> don't remember how. > > Oh, I didn't even want to go that far. I'm perfectly happy if it does a > text-based diff/patch of the contained XML files. Would clean/smudge > provide that already? yes.