login
Header Space

 
 

Re: git mergetool vs stash apply

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Alexander Gladysh <agladysh@...>
Cc: Jakub Narebski <jnareb@...>, <git@...>
Date: Tuesday, May 20, 2008 - 8:45 am

On Tue, May 20, 2008 at 04:32:49PM +0400, Alexander Gladysh wrote:


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.


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...


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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git mergetool vs stash apply, Alexander Gladysh, (Tue May 20, 4:02 am)
Re: git mergetool vs stash apply, Jeff King, (Tue May 20, 5:02 am)
Re: git mergetool vs stash apply, Alexander Gladysh, (Tue May 20, 7:16 am)
Re: git mergetool vs stash apply, Jakub Narebski, (Tue May 20, 7:52 am)
Re: git mergetool vs stash apply, Alexander Gladysh, (Tue May 20, 8:32 am)
Re: git mergetool vs stash apply, Jeff King, (Tue May 20, 8:45 am)
speck-geostationary