Re: [PATCH] rebase: use reflog to find common base with upstream

2013-10-20 Thread Martin von Zweigbergk
On Wed, Oct 16, 2013 at 11:53 AM, John Keeping wrote: > Commit 15a147e (rebase: use @{upstream} if no upstream specified, > 2011-02-09) says: > > Make it default to 'git rebase @{upstream}'. That is also what > 'git pull [--rebase]' defaults to, so it only makes sense that >

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-20 Thread Duy Nguyen
On Mon, Oct 21, 2013 at 12:57 AM, Antoine Pelisse wrote: > My main motive was to not *stop* the process when a long path is met. > Because somebody created a repository on Linux with a long file-name > doesn't mean you should not be able to clone it *at all* on Windows. That should be handled at

Re: pack corruption post-mortem

2013-10-20 Thread Nicolas Pitre
On Sun, 20 Oct 2013, Duy Nguyen wrote: > On Sat, Oct 19, 2013 at 9:41 PM, Nicolas Pitre wrote: > > On Sat, 19 Oct 2013, Duy Nguyen wrote: > > The SHA1 used in the name of the pack file is actually the SHA1 checksum > > of the SHA1 table. > > > > The path and ident tables are already protected by

Re: pack corruption post-mortem

2013-10-20 Thread Nicolas Pitre
On Sat, 19 Oct 2013, Shawn Pearce wrote: > On Sat, Oct 19, 2013 at 7:41 AM, Nicolas Pitre wrote: > > On Sat, 19 Oct 2013, Duy Nguyen wrote: > > > >> On Wed, Oct 16, 2013 at 3:34 PM, Jeff King wrote: > >> > I was recently presented with a repository with a corrupted packfile, > >> > and was asked

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-20 Thread Antoine Pelisse
My main motive was to not *stop* the process when a long path is met. Because somebody created a repository on Linux with a long file-name doesn't mean you should not be able to clone it *at all* on Windows. On Sun, Oct 20, 2013 at 12:33 PM, Duy Nguyen wrote: > On Sun, Oct 20, 2013 at 12:47 PM, T

[PATCH] Documentation: revamp gitk(1)

2013-10-20 Thread Thomas Rast
The gitk manpage suffers from a bit of neglect: there have been only minor changes, and no changes to the set of options documented, since a2df1fb (Documentation: New GUI configuration and command-line options., 2008-11-13). In the meantime, the set of rev-list options has been expanded several ti

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-20 Thread Duy Nguyen
On Sun, Oct 20, 2013 at 12:47 PM, Torsten Bögershausen wrote: > I'm not sure how to handle overlong path in general, there are several ways: > a) Silently overwrite memory (with help of memcpy() and/or strcpy() > b) Silently shorten the path using strlcpy() instead of strcpy() > c) Avoid the overw

Re: GSoC 2014: Summary so far, discussion starter: how to improve?

2013-10-20 Thread Thomas Gummerer
As participant in GSoC 2012 I'll mostly respond to this from a student point of view. Generally I had a great learning experience with my project. It was a great introduction into how the Git project and open source projects in general work and certainly lowered the barrier to start contributing

Re: [msysGit] [PATCH] Prevent buffer overflows when path is too big

2013-10-20 Thread Ondřej Bílka
On Sun, Oct 20, 2013 at 08:27:13AM +0200, Torsten Bögershausen wrote: > Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on > popelka.ms.mff.cuni.cz > Status: O > Content-Length: 2690 > Lines: 89 > > On 20.10.13 08:05, Ondřej Bílka wrote: > > On Sun, Oct 20, 2013 at 07:47:06AM +0200, To