From: Junio C Hamano <gitster@pobox.com>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: git@vger.kernel.org, peff@peff.net, sbeller@google.com, avarab@gmail.com
Subject: Re: [PATCH v3] log -G: ignore binary files
Date: Wed, 26 Dec 2018 15:24:05 -0800 [thread overview]
Message-ID: <xmqqlg49mmus.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: f7cb34c6268f556772fa4ee374e2541ba518e2b8.1544811828.git.thomas.braun@virtuell-zuhause.de
Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:
> - The internally used algorithm for generating patch text is based on
> xdiff and its states in [1]
>
> > The output format of the binary patch file is proprietary
> > (and binary) and it is basically a collection of copy and insert
> > commands [..]
>
> which means that the current format could change once the internal
> algorithm is changed as the format is not standardized. In addition
> the git binary patch format used for preparing patches for git apply
> is *different* from the xdiff format as can be seen by comparing
This particular argument sounds like a red herring. After all, when
the --text option is given
>
> git log -p -a
>
> commit 6e95bf4bafccf14650d02ab57f3affe669be10cf
> Author: A U Thor <author@example.com>
> Date: Thu Apr 7 15:14:13 2005 -0700
>
> modify binary file
>
> diff --git a/data.bin b/data.bin
> index f414c84..edfeb6f 100644
> --- a/data.bin
> +++ b/data.bin
> @@ -1,2 +1,4 @@
> a
> a^@a
> +a
> +a^@a
we will see 'a' in the output no matter how xdiff internally works;
there is no way to express the above change textually without
showing "+a" somewhere in the patch output.
The rest of the log message looks good, and ...
> Changes since v2:
> - Introduce a setup step for the new tests
> - Really start with a clean history in the tests
> - Added more complex commit history for the tests
> - Use test_when_finished for cleanup instead of doing nothing
> - Enhanced commit message to motivate the change better
> - Added some more documentation
... the tests are certainly a lot easier to follow.
Thanks.
next prev parent reply other threads:[~2018-12-28 20:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 20:52 [PATCH 0/2] Teach log -G to ignore binary files Thomas Braun
2018-11-21 20:52 ` [PATCH v1 1/2] log -G: Ignore " Thomas Braun
2018-11-21 20:52 ` [PATCH v1 2/2] log -S: Add test which searches in " Thomas Braun
2018-11-21 21:00 ` [PATCH 0/2] Teach log -G to ignore " Thomas Braun
2018-11-28 11:32 ` [PATCH v2] log -G: Ignore " Thomas Braun
2018-11-28 12:54 ` Ævar Arnfjörð Bjarmason
2018-12-14 18:44 ` Thomas Braun
2018-11-29 7:10 ` Junio C Hamano
2018-11-29 7:22 ` Junio C Hamano
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:49 ` [PATCH v3] log -G: ignore " Thomas Braun
2018-12-26 23:24 ` Junio C Hamano [this message]
2018-11-22 1:34 ` [PATCH v1 2/2] log -S: Add test which searches in " Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 9:14 ` Ævar Arnfjörð Bjarmason
2018-11-24 2:27 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 1:29 ` [PATCH v1 1/2] log -G: Ignore " Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 10:16 ` Ævar Arnfjörð Bjarmason
2018-11-22 16:27 ` Jeff King
2018-11-28 11:31 ` Thomas Braun
2018-11-28 11:31 ` Thomas Braun
2018-11-22 16:20 ` Jeff King
2018-11-24 2:32 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-26 20:19 ` Stefan Beller
2018-11-27 0:51 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlg49mmus.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=thomas.braun@virtuell-zuhause.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).