From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id A98BA1F859 for ; Tue, 16 Aug 2016 16:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751764AbcHPQ17 (ORCPT ); Tue, 16 Aug 2016 12:27:59 -0400 Received: from lang.hm ([66.167.227.134]:56313 "EHLO bifrost.lang.hm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbcHPQ17 (ORCPT ); Tue, 16 Aug 2016 12:27:59 -0400 Received: from asgard.lang.hm (asgard.lang.hm [10.0.0.100]) by bifrost.lang.hm (8.13.4/8.13.4/Debian-3) with ESMTP id u7GGRt18017826; Tue, 16 Aug 2016 09:27:55 -0700 Date: Tue, 16 Aug 2016 09:27:55 -0700 (PDT) From: David Lang X-X-Sender: dlang@asgard.lang.hm To: Nikolaus Rath cc: git@vger.kernel.org Subject: Re: Working with zip files In-Reply-To: <87y43wwujd.fsf@thinkpad.rath.org> Message-ID: References: <87y43wwujd.fsf@thinkpad.rath.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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. I think there's a way to tell it to do a xml aware diff/patch, but I don't remember how. David Lang