GIT GUI - Windows build will open a window on a disconnected display

I use a secondary monitor when at the office and I often will have applications open on the second display. The bug happens when I open the Git GUI application without having the second monitor connected. The dialog window that asks for selection is displayed properly but the main window is lost o

Re: ./t3310 fixed, t3400 broken

> t3310-notes-merge-manual-resolve.sh >failed during a short window (due to commit 2bd811ec) and > has already been fixed in commit 3a74ea38 ("notes: allow merging > from arbitrary references", 29-12-2015). Yes, it's fixed. Sorry for the noise. The next failure is t3400. Is there a chance to squ

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

On do, 2015-12-31 at 09:57 +0100, Dennis Kaarsemaker wrote: > > > +test_expect_success 'reflog containing non-commit sha1s displays > > > properly' ' > > > > In general, "properly" is a poor word to use in test description > (or > > a commit log message or a bug report, for that matter), as the >

Re: [PATCH v2 08/11] ref-filter: introduce prefixes for the align atom

On Thu, Dec 17, 2015 at 2:29 PM, Eric Sunshine wrote: > On Wed, Dec 16, 2015 at 10:29 AM, Karthik Nayak wrote: >> ref-filter: introduce prefixes for the align atom > > The prefixes are actually for the arguments to the 'align' atom, not > for the atom itself. However, it might be better to descri

[PATCH 7/7] diff --highlight-words: actually highlight words

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 53 ++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 47d22e3..68a847d 100644 --- a/diff.c +++ b/diff.c @@ -457,6 +457,50 @@ struct tagged_pointer { en

[PATCH 4/7] diff.c: refactor fn_out_diff_words_write_helper()

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/diff.c b/diff.c index 1354368..8a9e42f 100644 --- a/diff.c +++ b/diff.c @@ -807,12 +807,13 @@ static void diff_words_append(struct diff_words_data *diff_words,

[PATCH 6/7] diff.c: add new arguments to emit_line_0()

This patch is no-op, to reduce noise in the next one. Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 33 ++--- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/diff.c b/diff.c index 3b7317e..47d22e3 100644 --- a/diff.c +++ b/diff.c @@ -458,7 +458,9 @@

[PATCH 5/7] diff: unified diff with colored words, step 1, unified diff only

The goal is to produce a unified diff, but with changed words colored differently. A new diff-words mode is added that can keep track of both lines and words of each chunk. The marks then are post processed and each line is output in unified format. The actual word coloring comes in the next patch.

[PATCH 1/7] diff.c: keep all word diff structs together

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/diff.c b/diff.c index 80eb0c2..dfbed41 100644 --- a/diff.c +++ b/diff.c @@ -759,17 +759,6 @@ struct diff_words_buffer { int orig_nr, orig_alloc; };

[PATCH 2/7] diff.c: refactor diff_words_append()

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/diff.c b/diff.c index dfbed41..8af1df1 100644 --- a/diff.c +++ b/diff.c @@ -788,9 +788,17 @@ struct diff_words_data { struct diff_words_style *style;

[PATCH 3/7] diff --color-words: another special diff case

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/diff.c b/diff.c index 8af1df1..1354368 100644 --- a/diff.c +++ b/diff.c @@ -1037,6 +1037,16 @@ static void diff_words_show(struct diff_words_data *diff_words) diff_words

A failed attempt to integrate diff-highlight to the core

This is mostly for the record. The patches are not as important as the result in this mail. But if you want to try out, you can. If you don't know, the script diff-highlight in contrib can highlight changes between two nearly identical lines, pointing out what characters are different. It can impr

Re: [PATCH v4 09/10] config: add core.untrackedCache

On Thu, Dec 31, 2015 at 12:23 AM, Junio C Hamano wrote: > Christian Couder writes: > >> On Tue, Dec 29, 2015 at 11:35 PM, Junio C Hamano wrote: >> ... >>> While the above is not wrong per-se, from the point of those who >>> looked for these options (that is, those who wanted to do a one-shot >>>

Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?

On 31/12/15 06:08, Eric Sunshine wrote: > On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen wrote: >> I got 2 failures on pu under Mac OS, (Linux is OK) >> I did some very basic debugging, it seems as if grep doesn't find >> a needed string. >> Does anybody have an idea here ? > > I'm unabl

Re: [PATCH/RFC v2 0/2] add regex match flags to git describe

On 12/31/2015 01:23 AM, Junio C Hamano wrote: Mostyn Bramley-Moore writes: OK, brainstorming a bit, how about either of these: 1) --match-pattern-type= It's a bit lengthy (maybe --match-type would be sufficient), but I like that the value names are shared with git grep etc option names. And

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

On wo, 2015-12-30 at 16:02 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..0ebd1da 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -221,6 +221,7 @@ void fake_reflog_parent(struct reflog_walk_info > > *info