From: Jeff King <peff@peff.net>
To: Alexander Gladysh <agladysh@gmail.com>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: git mergetool vs stash apply
Date: Tue, 20 May 2008 08:45:58 -0400 [thread overview]
Message-ID: <20080520124557.GA5873@sigill.intra.peff.net> (raw)
In-Reply-To: <c6c947f60805200532h53e7ec64jb846f1d8c1b7066c@mail.gmail.com>
On Tue, May 20, 2008 at 04:32:49PM +0400, Alexander Gladysh wrote:
> 1. My repo is 650+ MB, my working copy is 350+ KLOC. That size is hard
> to share. Would that tool reduce it enough? Is it possible to filter
> out irrelevant content somehow?
It doesn't really shrink it very much. You can always filter out some
content with filter-branch, but the trick is trying to produce a repo
that still exhibits the problem. In your case, it might be enough to
simply provide the stashed state and the state upon which you are trying
to apply.
> 2. Would that tool obfuscate binaries as well?
It looks at lines, so wherever your binary happened to have a newline,
it would get split into chunks. So the answer is yes, it would obfuscate
them, but the diffs won't necessarily be meaningful.
All that being said...
> Furthermore, I have tried to reproduce that bug once again (by
> checking out that problematic revision and trying to apply that git
> stash on it) and was unable to (but my repo has changed since that).
> Perhaps it was some "moonphase-related" fluctuation...
Obfuscating your repository to let us reproduce is pointless if you
can't reproduce on the repository itself. So I would keep an eye on it,
and if it happens again, try to save the broken state.
-Peff
prev parent reply other threads:[~2008-05-20 12:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-20 8:02 git mergetool vs stash apply Alexander Gladysh
2008-05-20 9:02 ` Jeff King
2008-05-20 11:16 ` Alexander Gladysh
2008-05-20 11:52 ` Jakub Narebski
2008-05-20 12:32 ` Alexander Gladysh
2008-05-20 12:45 ` Jeff King [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080520124557.GA5873@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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.
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 NNTP newsgroup(s).