Re: [PATCH] git-prompt: make colors available in custom prompts

2016-05-01 Thread Simon Oosthoek
Hi Andrew sorry, I only noticed your request this morning... On 22/04/16 07:00, Andrew Schwartzmeyer wrote: This was disabled in the original implementation, probably because it does not work if the __git_ps1 function is single-quoted. However, if you double-quote per the updated documentation,

Re: [PATCH] git-stash: Don't GPG sign when stashing changes

2016-05-01 Thread Daurnimator
On 15 April 2016 at 01:50, Johannes Schindelin wrote: > Hi Cameron, > > On Wed, 13 Apr 2016, Cameron Currie wrote: > >> > > On Thu, 7 Apr 2016, daurnimator wrote: >> > > >> > >> Cameron Currie cameroncurrie.net> writes: >> > >> > This is helpful for folks with commit.gpgsign = true in their >> >

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

2016-05-01 Thread Torsten Bögershausen
On 05/01/2016 08:02 AM, Mike Hommey wrote: + if (flags & CONNECT_DIAG_URL) { printf("Diag: url=%s\n", url ? url : "NULL"); printf("Diag: protocol=%s\n", prot_name(protocol)); printf("Diag: hostandport=%s\n", hostandport ? hostandport : "NULL"

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

2016-05-01 Thread Mike Hommey
On Sun, May 01, 2016 at 03:37:24PM +0200, Torsten Bögershausen wrote: > I skipped the dates and names (I was responsible for one regression) > I hope this gives a half-correct overview, > why I am reluctant to change any code in connect.c > unless there is a fix for a real world problem. I don't a

[PATCH] git-stash: add flag to skip "git reset --hard"

2016-05-01 Thread Tom Anderson
Add the "--no-reset" (same as "-r") flag to git-stash.sh. A common workflow is to use "git-stash save" and "git-stash apply" to save your work without modifying your changed files. This forces users to reload their changed files in text editors like emacs, and touches the modify time on all chan

Re: [PATCH 1/6] connect: remove get_port()

2016-05-01 Thread Mike Hommey
On Sun, May 01, 2016 at 12:10:09PM +0200, Torsten Bögershausen wrote: > On 2016-05-01 08.02, Mike Hommey wrote: > > get_port() is only used as a fallback when get_host_and_port() does not > > return a port. But get_port() does the same search as > > get_host_and_port(), except get_host_and_port() s

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-01 Thread Eric Sunshine
On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder wrote: > Signed-off-by: Christian Couder > --- > diff --git a/builtin/apply.c b/builtin/apply.c > @@ -4562,12 +4562,12 @@ static int apply_all_patches(struct apply_state > *state, > > fd = open(arg, O_RDONLY); > if

Re: [PATCH 59/83] builtin/apply: move init_apply_state() to apply.c

2016-05-01 Thread Christian Couder
On Sun, May 1, 2016 at 9:37 PM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/apply.c b/apply.c >> @@ -0,0 +1,80 @@ >> +#include "cache.h" >> +#include "apply.h" >> + >> + >> + > > Too many blank lines?

Re: [PATCH 54/83] builtin/apply: make parse_chunk() return a negative integer on error

2016-05-01 Thread Christian Couder
On Sun, May 1, 2016 at 9:04 PM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder > wrote: >> This negative number can be -2 if no patch header has been found, >> otherwise it is -1. >> >> As parse_chunk() is called only by apply_patch() which already >> returns -1 when an

Re: [PATCH 59/83] builtin/apply: move init_apply_state() to apply.c

2016-05-01 Thread Eric Sunshine
On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > Signed-off-by: Christian Couder > --- > diff --git a/apply.c b/apply.c > @@ -0,0 +1,80 @@ > +#include "cache.h" > +#include "apply.h" > + > + > + Too many blank lines? > +static void git_apply_config(void) > +{ > + git_config_get_

Re: [PATCH 55/83] builtin/apply: make parse_single_patch() return -1 on error

2016-05-01 Thread Eric Sunshine
On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > Signed-off-by: Christian Couder > --- > diff --git a/builtin/apply.c b/builtin/apply.c > @@ -1802,8 +1806,10 @@ static int parse_single_patch(struct apply_state > *state, > fragment = xcalloc(1, sizeof(*fragment)); >

Re: [PATCH 65/83] builtin/apply: make gitdiff_verify_name() return -1 on error

2016-05-01 Thread Christian Couder
On Mon, Apr 25, 2016 at 3:36 PM, Duy Nguyen wrote: > On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> builtin/apply.c | 52 ++-- >> 1 file changed, 30 insertions(+), 22 deletions(-) >> >> diff

[PATCH jk/push-client-deadlock-fix] Windows: add pthread_sigmask() that does nothing

2016-05-01 Thread Johannes Sixt
A previous change introduced a call to pthread_sigmask() in order to block SIGPIPE in a thread. Since there are no signal facilities on Windows that are similar to POSIX signals, just ignore the request to block the signal. In the particular case, the effect of blocking SIGPIPE on POSIX is that wri

Re: [PATCH 54/83] builtin/apply: make parse_chunk() return a negative integer on error

2016-05-01 Thread Eric Sunshine
On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder wrote: > This negative number can be -2 if no patch header has been found, > otherwise it is -1. > > As parse_chunk() is called only by apply_patch() which already > returns -1 when an error happened, let's make it return -1 when > parse_chunk() re

Re: [PATCH 27/41] grep.c: use error_errno()

2016-05-01 Thread Eric Sunshine
On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/grep.c b/grep.c > @@ -1732,7 +1732,7 @@ static int grep_source_load_file(struct grep_source *gs) > if (lstat(filename, &st) < 0) { > err_ret: > if

Re: [PATCH 12/41] builtin/update-index.c: use error_errno()

2016-05-01 Thread Eric Sunshine
On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy wrote: > "err" is deleted because it just causes confusion when "errno" is also > used directly in process_lstat_error(). Despite the function name which may imply that it is consulting errno, this change makes me feel slightly uncomfortable si

Re: [PATCH 17/41] compat/win32/syslog.c: use warning_errno()

2016-05-01 Thread Eric Sunshine
On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c > @@ -28,13 +28,13 @@ void syslog(int priority, const char *fmt, ...) > va_end(ap); > > if (str_len < 0) { > -

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-01 Thread Christian Couder
On Mon, Apr 25, 2016 at 3:30 PM, Duy Nguyen wrote: > On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder > wrote: >> if (state->update_index) { >> if (write_locked_index(&the_index, state->lock_file, >> COMMIT_LOCK)) >> - die(_("Unable to write new ind

Re: [PATCH 08/41] builtin/mailsplit.c: use error_errno()

2016-05-01 Thread Eric Sunshine
On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c > @@ -109,7 +109,7 @@ static int populate_maildir_list(struct string_list > *list, const char *path) > if ((dir = opend

Re: [PATCH 01/41] usage.c: move format processing out of die_errno()

2016-05-01 Thread Eric Sunshine
On Sun, May 1, 2016 at 7:14 AM, Nguyễn Thái Ngọc Duy wrote: > fmt_with_err() will be shared with the coming error_errno() and > warning_errno(). > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/usage.c b/usage.c > @@ -109,19 +109,12 @@ void NORETURN die(const char *err, ...) > -void N

Re: pthread_sigmask() on windows (wine actualy)

2016-05-01 Thread Jeff King
On Sun, May 01, 2016 at 06:06:07PM +0700, Duy Nguyen wrote: > I got this while compiling master today using mingw32 cross toolchain > > CC run-command.o > run-command.c: In function 'run_thread': > run-command.c:596:3: warning: implicit declaration of function > 'pthread_sigmask' [-Wimplicit-

gitk: "lime" color incompatible with older Tk versions

2016-05-01 Thread Andrew Janke
Hi, git folks, I'm having trouble running gitk on Mac OS X 10.9.5. The gitk program uses the color "lime", which is not present in older versions of Tk, apparently including the Tk 8.5 which ships with 10.9. When I try to launch it, I get this error. |$ gitk Error in startup script: unknown

Re: [PATCH 61/83] builtin/apply: libify check_apply_state()

2016-05-01 Thread Christian Couder
On Mon, Apr 25, 2016 at 3:26 PM, Duy Nguyen wrote: > On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> builtin/apply.c | 16 +--- >> 1 file changed, 9 insertions(+), 7 deletions(-) >> >> diff --git a/builtin/apply.c b/builtin/app

Re: [PATCH 53/83] builtin/apply: make find_header() return -1 instead of die()ing

2016-05-01 Thread Christian Couder
On Wed, Apr 27, 2016 at 8:10 PM, Eric Sunshine wrote: > On Mon, Apr 25, 2016 at 9:18 AM, Duy Nguyen wrote: >> On Sun, Apr 24, 2016 at 8:33 PM, Christian Couder >> wrote: >>> To be compatible with the rest of the error handling in builtin/apply.c, >>> find_header() should return -1 instead of cal

Re: [PATCH 53/83] builtin/apply: make find_header() return -1 instead of die()ing

2016-05-01 Thread Christian Couder
On Wed, Apr 27, 2016 at 8:08 PM, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:33 AM, Christian Couder > wrote: >> To be compatible with the rest of the error handling in builtin/apply.c, >> find_header() should return -1 instead of calling die(). >> >> Unfortunately find_header() already retu

Re: [PATCH v8 10/10] ce_compare_data() did not respect conversion

2016-05-01 Thread Torsten Bögershausen
On 29.04.16 23:09, Junio C Hamano wrote: > Well, didn't I do exactly the above much earlier and discarded it > because that breaks the definition of "diff"? Or is this doing > something differently? Yes, and I try to sneak it in anyway ;-) I spend some time debugging how to get t6038 passed, an

[PATCH] t5510: run auto-gc in the foreground

2016-05-01 Thread SZEDER Gábor
The last test added to 't5510-fetch' in 0898c9628104 (fetch: release pack files before garbage-collecting, 2016-01-13) may sporadically trigger following error message from the test harness: rm: cannot remove 'trash directory.t5510-fetch/auto-gc/.git': Directory not empty The test in question

Re: [PATCH 2/6] connect: uniformize and group CONNECT_DIAG_URL handling code

2016-05-01 Thread Torsten Bögershausen
On 01.05.16 08:02, Mike Hommey wrote: > The CONNECT_DIAG_URL code for PROTO_GIT and PROTO_SSH were different in > subtle ways. Yes, and there (historical) reasons for that. The first implementation did support IPV6 with SSH: commit 5ba884483fe1a5f9ce1ce5e3c5e1c37c0fd296c4 [PATCH] GIT: Try a

Re: [PATCH 00/41] Add and use error_errno() and warning_errno()

2016-05-01 Thread Duy Nguyen
On Sun, May 01, 2016 at 06:14:16PM +0700, Nguyễn Thái Ngọc Duy wrote: > This is a spinoff from my worktree-move topic. This series adds > die_errno() companions, error_errno() and warning_errno(), and use them > where applicable to reduce the amount of typing (in future). I had this patch in the s

[PATCH 36/41] sha1_file.c: use {error,die,warning}_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1_file.c | 32 +--- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index d0f2aa0..a7f45b3 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1107,9 +1107,8 @@ unsigned char *use_pack(stru

[PATCH 40/41] vcs-svn: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- vcs-svn/line_buffer.c| 4 ++-- vcs-svn/sliding_window.c | 2 +- vcs-svn/svndiff.c| 4 ++-- vcs-svn/svndump.c| 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c index 57cc

[PATCH 39/41] upload-pack.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- upload-pack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index dc802a0..f19444d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -174,8 +174,7 @@ static void create_pack_file(void)

[PATCH 37/41] transport-helper.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- transport-helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b934183..f09fadc 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1166,7 +1166,7 @@ static int udt_do_read

[PATCH 35/41] server-info.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- server-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-info.c b/server-info.c index 5a86e29..75dd677 100644 --- a/server-info.c +++ b/server-info.c @@ -36,7 +36,7 @@ static int update_info_file(char *path, int (*generate)(F

[PATCH 41/41] wrapper.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- wrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper.c b/wrapper.c index 9afc1a0..3df2fe0 100644 --- a/wrapper.c +++ b/wrapper.c @@ -572,7 +572,7 @@ static int warn_if_unremovable(const char *op, const char *file, int r

[PATCH 38/41] unpack-trees.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 9f55cc2..bb0d142 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1499,8 +1499,7 @@ static int verify_absent_1(const struct ca

[PATCH 30/41] mailmap.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- mailmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mailmap.c b/mailmap.c index 9726237..b5c521f 100644 --- a/mailmap.c +++ b/mailmap.c @@ -189,8 +189,7 @@ static int read_mailmap_file(struct string_list *map, const char *filena

[PATCH 29/41] ident.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- ident.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ident.c b/ident.c index 4fd82d1..139c528 100644 --- a/ident.c +++ b/ident.c @@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf) mailname = fopen("/e

[PATCH 33/41] run-command.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- run-command.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/run-command.c b/run-command.c index e4593cd..842c8d1 100644 --- a/run-command.c +++ b/run-command.c @@ -233,7 +233,7 @@ static int wait_or_whine(pid_t pid, con

[PATCH 32/41] rerere.c: use error_errno() and warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- rerere.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/rerere.c b/rerere.c index c8b9f40..1810c04 100644 --- a/rerere.c +++ b/rerere.c @@ -501,8 +501,7 @@ static int handle_file(const char *path, unsigned char *sha

[PATCH 31/41] reachable.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- reachable.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reachable.c b/reachable.c index ed35201..d0199ca 100644 --- a/reachable.c +++ b/reachable.c @@ -119,8 +119,7 @@ static int add_recent_loose(const unsigned char *sha1,

[PATCH 34/41] sequencer.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- sequencer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index e66f2fe..4687ad4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -875,8 +875,7 @@ static int sequencer_rollback(struct replay_opts *opts)

[PATCH 28/41] http.c: use error_errno() and warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- http.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 4304b80..7565c93 100644 --- a/http.c +++ b/http.c @@ -446,8 +446,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)

[PATCH 26/41] gpg-interface.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- gpg-interface.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gpg-interface.c b/gpg-interface.c index 2259938..c4b1e8c 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -219,11 +219,9 @@ int verify_signed_buffer(const char *p

[PATCH 27/41] grep.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- grep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grep.c b/grep.c index 528b652..87c1890 100644 --- a/grep.c +++ b/grep.c @@ -1732,7 +1732,7 @@ static int grep_source_load_file(struct grep_source *gs) if (lstat(filename,

[PATCH 25/41] fast-import.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- fast-import.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fast-import.c b/fast-import.c index 9fc7093..21881d1 100644 --- a/fast-import.c +++ b/fast-import.c @@ -414,7 +414,7 @@ static void write_crash_report(const char *e

[PATCH 18/41] config.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 22 +- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/config.c b/config.c index 10b5c95..80411e4 100644 --- a/config.c +++ b/config.c @@ -2012,7 +2012,7 @@ int git_config_set_multivar_in_file_gently(const char

[PATCH 24/41] entry.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- entry.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/entry.c b/entry.c index a410957..519e042 100644 --- a/entry.c +++ b/entry.c @@ -168,8 +168,8 @@ static int write_entry(struct cache_entry *ce, ret

[PATCH 14/41] builtin/worktree.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index d8e3795..331ecf6 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -110,7 +110,7 @@ static void prune_worktrees(vo

[PATCH 12/41] builtin/update-index.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
"err" is deleted because it just causes confusion when "errno" is also used directly in process_lstat_error(). Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.

[PATCH 22/41] diff-no-index.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- diff-no-index.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 03daadb..1f8999b 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -65,8 +65,7 @@ static int populate_from_stdin(struct diff_fi

[PATCH 21/41] credential-cache--daemon.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- credential-cache--daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index 291c0fd..1f14d56 100644 --- a/credential-cache--daemon.c +++ b/credential-cache--daemon.c @@ -17

[PATCH 13/41] builtin/upload-archive.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/upload-archive.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index dbfe14f..2caedf1 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -104,8 +104,7 @

[PATCH 23/41] editor.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- editor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editor.c b/editor.c index 01c644c..7519ede 100644 --- a/editor.c +++ b/editor.c @@ -63,7 +63,6 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *e

[PATCH 19/41] connected.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- connected.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/connected.c b/connected.c index 299c560..bf1b12e 100644 --- a/connected.c +++ b/connected.c @@ -86,17 +86,14 @@ static int check_everything_connected_real(sha1_iterate_

[PATCH 20/41] copy.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/copy.c b/copy.c index 574fa1f..4de6a11 100644 --- a/copy.c +++ b/copy.c @@ -42,15 +42,15 @@ int copy_file(const char *dst, const char *src, int mode) status = copy_fd(f

[PATCH 16/41] combine-diff.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- combine-diff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index 0e1d4b0..8f2313d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1005,8 +1005,7 @@ static void show_patch_diff(struct combine_dif

[PATCH 15/41] check-racy.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- check-racy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-racy.c b/check-racy.c index 00d92a1..24b6542 100644 --- a/check-racy.c +++ b/check-racy.c @@ -12,7 +12,7 @@ int main(int ac, char **av) struct stat st;

[PATCH 17/41] compat/win32/syslog.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- compat/win32/syslog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c index b905aea..1c2ae18 100644 --- a/compat/win32/syslog.c +++ b/compat/win32/syslog.c @@ -28,13 +28,13 @@ void sysl

[PATCH 11/41] builtin/rm.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/rm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rm.c b/builtin/rm.c index 8829b09..13b9639 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -152,7 +152,7 @@ static int check_local_mod(unsigned char *head, int index_o

[PATCH 07/41] builtin/help.c: use warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/help.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index 3c55ce4..8848013 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -127,7 +127,7 @@ static void exec_woman_emacs(const char *p

[PATCH 08/41] builtin/mailsplit.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mailsplit.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c index 104277a..4859ede 100644 --- a/builtin/mailsplit.c +++ b/builtin/mailsplit.c @@ -109,7 +109,7 @@ static int pop

[PATCH 10/41] builtin/pack-objects.c: use die_errno() and warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a27de5b..e18e190 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -828,8 +828,7 @@ st

[PATCH 09/41] builtin/merge-file.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/merge-file.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 5544705..13e22a2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -62,8 +62,7 @@ int cmd_mer

[PATCH 06/41] builtin/fetch.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fetch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index f8455bd..1582ca7 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -607,7 +607,7 @@ static int store_updated_refs(const char

[PATCH 03/41] bisect.c: use die_errno() and warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- bisect.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bisect.c b/bisect.c index 7996c29..6d93edb 100644 --- a/bisect.c +++ b/bisect.c @@ -860,8 +860,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_c

[PATCH 05/41] builtin/branch.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0adba62..6f1572d 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -593,8 +593,7 @@ static int edit_branch_description(con

[PATCH 04/41] builtin/am.c: use error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/am.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index d003939..3dfe70b 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -769,15 +769,15 @@ static int split_mail_conv(mail_conv_fn fn, st

[PATCH 02/41] usage.c: add warning_errno() and error_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
Similar to die_errno(), these functions will append strerror() automatically. Signed-off-by: Nguyễn Thái Ngọc Duy --- git-compat-util.h | 2 ++ usage.c | 19 +++ 2 files changed, 21 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h index 1f8b5f3..49d402

[PATCH 01/41] usage.c: move format processing out of die_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
fmt_with_err() will be shared with the coming error_errno() and warning_errno(). Signed-off-by: Nguyễn Thái Ngọc Duy --- usage.c | 25 +++-- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/usage.c b/usage.c index 82ff131..0dba0c5 100644 --- a/usage.c +++ b/usa

[PATCH 00/41] Add and use error_errno() and warning_errno()

2016-05-01 Thread Nguyễn Thái Ngọc Duy
This is a spinoff from my worktree-move topic. This series adds die_errno() companions, error_errno() and warning_errno(), and use them where applicable to reduce the amount of typing (in future). Changes are split by file (which explains the huge number of patches). I leave builtin/apply.c and ref

pthread_sigmask() on windows (wine actualy)

2016-05-01 Thread Duy Nguyen
I got this while compiling master today using mingw32 cross toolchain CC run-command.o run-command.c: In function 'run_thread': run-command.c:596:3: warning: implicit declaration of function 'pthread_sigmask' [-Wimplicit-function-declaration] run-command.c:596:23: error: 'SIG_BLOCK' undeclared

[ubuntu] gitk/git gui fail after upgrade

2016-05-01 Thread Tim Blechmann
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 hi all, asking the experts: after upgrading one of my machines to git, gitk and git gui fail to start ... * git gui fails with "cannot determine git version" * gitk fails with "cannot find a git repository here" other git commands work fine. issue

Re: [PATCH 1/6] connect: remove get_port()

2016-05-01 Thread Torsten Bögershausen
On 2016-05-01 08.02, Mike Hommey wrote: > get_port() is only used as a fallback when get_host_and_port() does not > return a port. But get_port() does the same search as > get_host_and_port(), except get_host_and_port() starts from the end of > the host, respecting square brackets for ipv6 addresse

[PATCH] git-fixup: automatically create a fixup commit

2016-05-01 Thread Michael S. Tsirkin
Sometimes I get a broken patch, apply it and then need to fix it up. git commit --fixup is perfect for this, but makes me look up the commit that created the breakage manually. git-fixup is a tool to speed this up. Several heuristics would be reasonable for locating the problematic commit: 1. look

Feature request: Add word wrapping to gitk display

2016-05-01 Thread Ailin Nemui
Hi, when working on text files with long lines, "word diff" can produce appropriate diff display. However, the long lines cannot be viewed very well in gitk (requires excessive scrolling). I found out that it is quite easy to achieve this index 805a1c7..5ba7472 100755 --- a/gitk +++ b/gitk @@ -