Re: [PATCH v3 1/4] replace: add --graft option

2014-06-07 Thread Christian Couder
On Fri, Jun 6, 2014 at 5:44 PM, Christian Couder wrote: > > /* find existing parents */ > strbuf_addstr(&buf, commit->buffer); Unfortunately, it looks like the above will not work if the commit->buffer contains an embedded NUL. I wonder if it is a real problem or not. -- To unsubs

Re: [PATCH 1/2] userdiff: support C# async methods and correct C# keywords

2014-06-07 Thread Steve Hoelzer
On Fri, Jun 6, 2014 at 12:34 PM, Junio C Hamano wrote: > Steve Hoelzer writes: > >> instanceof() is listed as keywords, but there is no such thing (it is >> in Java, though); in C# we use typeof(), 'is', and 'as for similar >> purposes > > You would need to balance the quotes around "as" ;-) Ind

[PATCH] completion: Handle '!f() { ... }; f' aliases

2014-06-07 Thread Steffen Prohaska
'!f() { ... }; f' is a recommended pattern to declare more complex aliases (see git wiki [1]). This commit teaches the completion to handle them. When determining which completion to use for an alias, the opening brace is now ignored in order to continue the search for a git command inside the fu

Re: Reset by checkout?

2014-06-07 Thread Philip Oakley
From: "Atsushi Nakagawa" Kevin Bracey wrote: On 01/06/2014 07:26, Atsushi Nakagawa wrote: > Kevin Bracey wrote: >> The original "git reset --hard" used to be a pretty top-level >> command. >> It was used for aborting merges in particular. But I think it now >> stands out as being one of the

Re: sort entries numerically

2014-06-07 Thread Duy Nguyen
On Sat, Jun 7, 2014 at 1:05 PM, Toralf Förster wrote: > Hi, > > is there any chance to have "1.8" before "1.10" in an output like the > following : > > ... > From https://code.wireshark.org/review/wireshark >52fe0aa..b69642d master -> origin/master >460db8a..540f061 master-1.10 -> o

Re: sort entries numerically

2014-06-07 Thread Fredrik Gustafsson
On Sat, Jun 07, 2014 at 08:05:34AM +0200, Toralf Förster wrote: > is there any chance to have "1.8" before "1.10" in an output like the > following : > > ... > From https://code.wireshark.org/review/wireshark >52fe0aa..b69642d master -> origin/master >460db8a..540f061 master-1.10 ->

[PATCH] send-email: do not insert third header

2014-06-07 Thread Stepan Kasal
It is sometimes desirable to insert several header lines at the top of the body, e.g., if From or Date differs from the mail header. (Linus even recommends to use this second header for all kernel submissions.) send-email has a minimal support for this; make sure it is not applied when there is a

[PATCH v2 0/6] First part of Unicode console support for msysgit

2014-06-07 Thread Stepan Kasal
Hello, this patch series is to be applied on top of "move main() macro to a function", discussed in another thread. I added the two patches Karsten mentioned: Win32: add Unicode conversion functions Win32: fix broken pipe detection I also copied the links for the fixups incuded. Regards,

[PATCH v2 3/6] Warn if the Windows console font doesn't support Unicode

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Sat, 31 Jul 2010 00:04:03 + Unicode console output won't display correctly with default settings because the default console font ("Terminal") only supports the system's OEM charset. Unfortunately, this is a user specific setting, so it cannot be easily fixed by e.g.

[PATCH v2 2/6] Detect console streams more reliably on Windows

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Sat, 31 Jul 2010 00:04:02 + GetStdHandle(STD_OUTPUT_HANDLE) doesn't work for stderr if stdout is redirected. Use _get_osfhandle of the FILE* instead. _isatty() is true for all character devices (including parallel and serial ports). Check return value of GetConsoleS

[PATCH v2 1/6] Support Unicode console output on Windows

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Sat, 31 Jul 2010 00:04:01 + WriteConsoleW seems to be the only way to reliably print unicode to the console (without weird code page conversions). Also redirects vfprintf to the winansi.c version. Signed-off-by: Karsten Blees Signed-off-by: Johannes Schindelin Si

[PATCH v2 4/6] Win32: add Unicode conversion functions

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Fri, 25 Nov 2011 21:05:06 +0100 Add Unicode conversion functions to convert between Windows native UTF-16LE encoding to UTF-8 and back. To support repositories with legacy-encoded file names, the UTF-8 to UTF-16 conversion function tries to create valid, unique file nam

[PATCH v2 5/6] Win32: Thread-safe windows console output

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Sat, 14 Jan 2012 22:24:19 +0100 Winansi.c has many static variables that are accessed and modified from the [v][f]printf / fputs functions overridden in the file. This may cause multi threaded git commands that print to the console to produce corrupted output or even cra

[PATCH v2 6/6] Win32: fix broken pipe detection

2014-06-07 Thread Stepan Kasal
From: Karsten Blees Date: Thu, 1 Mar 2012 21:53:54 +0100 As of "Win32: Thread-safe windows console output", git-log no longer terminates when the pager process dies. This is due to disabling buffering for the replaced stdout / stderr streams. Git-log will periodically fflush stdout (see write_or_

Re: How to restore changes to the remote master branch to its previous stage ?

2014-06-07 Thread Johannes Sixt
Am 07.06.2014 08:07, schrieb Arup Rakshit: > Hi, > > I am working in a project, where I am using *Git*. Today, I have been advised > > by my manager to do some change and it was an urgent request. I did the > change > and tested also, All was working fine. The big mistake I did, all the chang

Re: What's cooking in git.git (Jun 2014, #02; Fri, 6)

2014-06-07 Thread David Kastrup
Junio C Hamano writes: > "git blame" has been optimized greatly by reorganising the data > structure that is used to keep track of the work to be done, thanks > to David Karstrup . I guess that "reorganising the data structure" for months is not worth the trouble of getting the name right. A

How to restore changes to the remote master branch to its previous stage ?

2014-06-07 Thread Arup Rakshit
Hi, I am working in a project, where I am using *Git*. Today, I have been advised by my manager to do some change and it was an urgent request. I did the change and tested also, All was working fine. The big mistake I did, all the changes I made in the *master* branch without creating a topic

Re: [msysGit] Re: [PATCH 3/5] Warn if the Windows console font doesn't support Unicode

2014-06-07 Thread Stepan Kasal
Hi, On Fri, Jun 06, 2014 at 10:18:43PM +0100, Peter Krefting wrote: > Stepan Kasal: >> +"switching to a TrueType font such as Lucida Console!"); [...] > modernizing the suggestion here to recomment "Consolas". It is available Indeed. So, I'll keep this patch as it is, for the record