Re: Revert option for git add --patch

2012-11-07 Thread Simon Rozet
help On Wed, Nov 7, 2012 at 3:54 PM, Nathan Broadbent wrote: > Hi, > > I would like to propose a revert option for 'git add --patch', that > reverts the hunk. I often use `git add -p` to skip whitespace changes > when preparing a patch, and a 'revert' option would save me from > running 'git chec

Re: [PATCH/RFC] launch_editor: ignore SIGINT while the editor has control

2012-11-07 Thread Paul Fox
the user's editor likely catches SIGINT (ctrl-C). but if the user spawns a command from the editor and uses ctrl-C to kill that command, the SIGINT will likely also kill git itself. (depending on the editor, this can leave the terminal in an unusable state.) Signed-off-by: Paul Fox --- krzyszt

Re: [PATCH/RFC] launch_editor: ignore SIGINT while the editor has control

2012-11-07 Thread Krzysztof Mazur
On Wed, Nov 07, 2012 at 02:16:52PM -0500, Paul Fox wrote: > the user's editor likely catches SIGINT (ctrl-C). but if the user > spawns a command from the editor and uses ctrl-C to kill that command, > the SIGINT will likely also kill git itself. (depending on the > editor, this can leave the term

Re: [RFC] Add a new email notification script to "contrib"

2012-11-07 Thread Ævar Arnfjörð Bjarmason
On Fri, Jul 20, 2012 at 12:01 PM, Michael Haggerty wrote: > On 07/14/2012 08:59 AM, mhag...@alum.mit.edu wrote: >> >> Add a new Python script, contrib/hooks/post-receive-multimail.py, that >> can be used to send notification emails describing pushes into a git >> repository. [...] > > > Thanks to

Re: crash on git diff-tree -Ganything for new files with textconv filter

2012-11-07 Thread Jeff King
On Wed, Nov 07, 2012 at 10:10:59PM +0100, Peter Oberndorfer wrote: > >> For me the key to reproduce the problem was to have 2 commits. > >> Adding the file in the root commit it did not work. [1] > > You probably would need to pass "--root" for it to do the diff of the > > initial commit. > > > >

Re: crash on git diff-tree -Ganything for new files with textconv filter

2012-11-07 Thread Peter Oberndorfer
On 2012-10-29 23:35, Jeff King wrote: > On Mon, Oct 29, 2012 at 09:19:48PM +0100, Peter Oberndorfer wrote: > >> I could reproduce with my 0x3000 bytes file on linux. The buffer is not >> read with a trailing null byte it is mapped by mmap in >> diff_populate_filespec... >> So i think we will not ge

Re: [PATCHv2 2/2] git p4: add support for 'p4 move' in P4Submit

2012-11-07 Thread Vitor Antunes
On Mon, Nov 5, 2012 at 5:57 PM, Pete Wyckoff wrote: > vitor@gmail.com wrote on Mon, 05 Nov 2012 17:37 +: >> Hi Pete, >> >> I've just been hit by a situation where this command is available but is >> disabled in the server. I don't know what is the best approach to avoid >> this issue. > >

Re: [PATCH 14/13] wildmatch: fix tests that fail on Windows due to path mangling

2012-11-07 Thread Johannes Sixt
Am 06.11.2012 13:47, schrieb Nguyen Thai Ngoc Duy: > On Mon, Nov 5, 2012 at 4:00 AM, Johannes Sixt wrote: >> Patterns beginning with a slash are converted to Windows paths before >> test-wildmatch gets to see them. Use a different first character. > > Or we could prepend the paths with something,

[PATCH/RFC] launch_editor: ignore SIGINT while the editor has control

2012-11-07 Thread Paul Fox
the user's editor likely catches SIGINT (ctrl-C). but if the user spawns a command from the editor and uses ctrl-C to kill that command, the SIGINT will likely also kill git itself. (depending on the editor, this can leave the terminal in an unusable state.) Signed-off-by: Paul Fox --- i often

Re: Long clone time after "done."

2012-11-07 Thread Uri Moszkowicz
To elaborate from before, my repository is about 2GB and has about 7k branches and tags with 15 years of history imported from CVS. I created a toy repository attempting to replicate the problem but haven't had any luck so instead I launched Git in a debugger to see what operation is taking so long

Re: Workflow for templates?

2012-11-07 Thread Holger Hellmuth (IKS)
Am 06.11.2012 22:07, schrieb Josef Wolf: On Tue, Nov 06, 2012 at 08:21:25PM +, Pyeron, Jason J CTR (US) wrote: Maybe I lost sight of your problem. Can you give a specific example of where "it" does not work? I guess it's _me_ who's lost. I can't figure how this is supposed to work. Maybe

Re: git-clone and unreliable links?

2012-11-07 Thread Shawn Pearce
On Wed, Nov 7, 2012 at 7:35 AM, Josef Wolf wrote: > When using git-clone over an unreliable link (say, UMTS) and the network goes > down, git-clone deletes everything what was downloaded. When the network goes > up again and you restart git-clone, it has to start over from the > beginning. Then, e

Re: What about SHA-1 collisions?

2012-11-07 Thread Shawn Pearce
On Tue, Nov 6, 2012 at 2:09 PM, Josef Wolf wrote: > > On Tue, Nov 06, 2012 at 09:41:29PM +, John McKown wrote: > > Josef Wolf raven.inka.de> writes: > > > Just for curiosity: what would happen if such a collision would occur > > > within > > > one repository? > > > In a sense, this cannot ha

git-clone and unreliable links?

2012-11-07 Thread Josef Wolf
Hello, When using git-clone over an unreliable link (say, UMTS) and the network goes down, git-clone deletes everything what was downloaded. When the network goes up again and you restart git-clone, it has to start over from the beginning. Then, eventually, the network goes down again, and everyth

Re: [PATCH] push/pull: adjust missing upstream help text to changed interface

2012-11-07 Thread Jeff King
On Wed, Nov 07, 2012 at 09:22:38AM +0100, Michael J Gruber wrote: > Junio C Hamano venit, vidit, dixit 06.11.2012 15:45: > > > > > > Michael J Gruber wrote: > > > >> Yes, I'm in low hanging fruits mood. > >> > >> Signed-off-by: Michael J Gruber > > > > It is called tying loose ends, and is v

Re: [PATCH] push/pull: adjust missing upstream help text to changed interface

2012-11-07 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.11.2012 15:45: > > > Michael J Gruber wrote: > >> Yes, I'm in low hanging fruits mood. >> >> Signed-off-by: Michael J Gruber > > It is called tying loose ends, and is very important. Very much appreciated. ;) By the way: The gotcha with the signed-off-b