Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Matthieu Moy
Karthik Nayak writes: > On Thu, Sep 3, 2015 at 7:04 PM, Karthik Nayak wrote: >>> struct strbuf s = STRBUF_INIT; >>> if (strtoul_ui(valp, 10, >u.contents.lines)) >>>

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Eric Sunshine
On Thu, Sep 3, 2015 at 10:39 AM, Eric Sunshine wrote: > On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: >> +static void append_lines(struct strbuf *out, const char *buf, unsigned long >> size, int lines) >> +{ >> + if ((sp = strstr(buf,

Re: [PATCH v1] t9821: use test_config

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 15:04, Eric Sunshine wrote: > On Thu, Sep 3, 2015 at 5:34 AM, wrote: >> From: Lars Schneider >> >> Signed-off-by: Lars Schneider >> --- >> diff --git

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Matthieu Moy
Eric Sunshine writes: > Also, if 'buf' is indeed unconditionally NUL-terminated, then the (sp > <= buf + size) check is wasted code since the result of strstr() will > always be either NULL or pointing somewhere within the NUL-terminated > string. The null character is

Re: [PATCH v5] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 10:26, Remi Galan Alfonso wrote: > Hi Lars, > > Lars Schneider writes: > >> +test_expect_success 'Clone repo containing iso8859-1 encoded paths with >> git-p4.pathEncoding' ' >> + >> +

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Eric Sunshine
On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: > In 'tag.c' we can print N lines from the annotation of the tag using > the '-n' option. Copy code from 'tag.c' to 'ref-filter' and > modify it to support appending of N lines from the annotation of tags > to the given

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Matthieu Moy
Eric Sunshine writes: >> @@ -624,6 +633,33 @@ static void find_subpos(const char *buf, unsigned long >> sz, >> *nonsiglen = *sig - buf; >> } >> >> +/* >> + * If 'lines' is greater than 0, append that many lines from the given >> + * 'buf' of length 'size' to

Default ordering of git log output

2015-09-03 Thread Kirill Likhodedov
Is it intended behavior that the default git log output (without ordering parameters) can show parents before children? The man says: Commit Ordering By default, the commits are shown in reverse chronological order. so it tells nothing about parent-to-child relationship. I‘ve just

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Karthik Nayak
On Thu, Sep 3, 2015 at 7:04 PM, Karthik Nayak wrote: >> struct strbuf s = STRBUF_INIT; >> if (strtoul_ui(valp, 10, >u.contents.lines)) >> die(_("positive width expected >> contents:lines=%s"),

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

2015-09-03 Thread Eric Sunshine
On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: > Implement an `align` atom which left-, middle-, or right-aligns the > content between %(align:..) and %(end). Spell this either %(align:) or %(align:...) with three dots, not two. I, personally, think %(align:) is

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

2015-09-03 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: >> Implement an `align` atom which left-, middle-, or right-aligns the >> content between %(align:..) and %(end). > > Spell this either %(align:) or %(align:...) with

Feature Request: enhance Git-GUI's Checkout Branch screen

2015-09-03 Thread John Medema
Git gurus, throw this one on your to-do list: This is a feature request to enhance the Git GUI to make it easier to checkout non-existing branches that exist upstream. Apologies if this is not the correct place for feature requests. Scenario: Upstream repo has 4 branches - master, develop,

Re: [PATCH v6] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 19:03, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> +test_expect_success 'Clone repo containing iso8859-1 encoded paths without >> git-p4.pathEncoding' ' >> +git p4 clone --destination="$git" //depot && >> +test_when_finished

Re: git dockerfile.

2015-09-03 Thread Junio C Hamano
Atul Sowani writes: > Hello! > > Any help/pointers/advise regarding my request about dockerfile? [jc: "Gawade P" Cc'ed.] Perhaps you can learn to ask the list archive ;-) Going to http://news.gmane.org/gmane.comp.version-control.git/ and then asking for "dockerfile" in the

Re: [PATCH 2/2] date: make "local" orthogonal to date format

2015-09-03 Thread Junio C Hamano
John Keeping writes: > On Wed, Sep 02, 2015 at 05:30:14PM -0400, Jeff King wrote: >> I think the error message would be a lot nicer if we indicate that "-" >> is syntactically interesting, and say: >> >> fatal: unknown date-mode modifier: locale > > I wonder if we'd be

Re: glibc mutex deadlock in signal handler

2015-09-03 Thread Junio C Hamano
Takashi Iwai writes: > we've got a bug report of git-log stall in below: > https://bugzilla.opensuse.org/show_bug.cgi?id=942297 > > In short, git-log is left unterminated sometimes when pager is > aborted. When this happens, git process can't be killed by SIGTERM, > but only by

Re: [PATCH v6] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread Junio C Hamano
Lars Schneider writes: > On 03 Sep 2015, at 19:03, Junio C Hamano wrote: > >> I'm tempted to suggest squashing the following in. Thoughts? > > OK. The diff looks good to me. For some reason I can’t apply the > patch though. git patch gives me

Re: [PATCHv5 1/3] submodule: Reimplement `module_list` shell function in C

2015-09-03 Thread Junio C Hamano
Stefan Beller writes: > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > new file mode 100644 > index 000..e97403e > --- /dev/null > +++ b/builtin/submodule--helper.c > @@ -0,0 +1,124 @@ > +#include "builtin.h" > +#include "cache.h" > +#include

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread Junio C Hamano
ga...@freebsd.org writes: > From: Renato Botelho > > git-submodule and git-request-pull are written in sh but use perl > internally. Add them to be replaced by unimplemented.sh when NO_PERL > flag is set > --- Missing sign-off. You also may want to hold off the

Re: [PATCHv5 1/3] submodule: Reimplement `module_list` shell function in C

2015-09-03 Thread Stefan Beller
On Thu, Sep 3, 2015 at 11:57 AM, Junio C Hamano wrote: > > It is customary to use X_alloc, X_nr for an array X_something that > is managed by ALLOC_GROW(), I think. I'd also suggest wrapping > these in a struct and passing it between module_list_compute() and > its callers. I

Re: Do you plan to release 2.5.2 any time soon?

2015-09-03 Thread Junio C Hamano
Johannes Schindelin writes: > I have a couple of fixes lined up for bugs in Git for Windows 2.5.1. Do > you plan to release 2.5.2 any time soon? If yes, I would hold off, > otherwise I will just do a Git for Windows 2.5.1 (Rel 2). Among the topics marked for possible

Re: glibc mutex deadlock in signal handler

2015-09-03 Thread Takashi Iwai
On Thu, 03 Sep 2015 20:12:38 +0200, Junio C Hamano wrote: > > Takashi Iwai writes: > > > we've got a bug report of git-log stall in below: > > https://bugzilla.opensuse.org/show_bug.cgi?id=942297 > > > > In short, git-log is left unterminated sometimes when pager is > >

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread Renato Botelho
> On Sep 3, 2015, at 16:11, Junio C Hamano wrote: > > ga...@freebsd.org writes: > >> From: Renato Botelho >> >> git-submodule and git-request-pull are written in sh but use perl >> internally. Add them to be replaced by unimplemented.sh when NO_PERL >>

[PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread garga
From: Renato Botelho git-submodule and git-request-pull are written in sh but use perl internally. Add them to be replaced by unimplemented.sh when NO_PERL flag is set Signed-off-by: Renato Botelho --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Karthik Nayak
On Thu, Sep 3, 2015 at 8:17 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Thu, Sep 3, 2015 at 7:04 PM, Karthik Nayak wrote: struct strbuf s = STRBUF_INIT;

[PATCH v2] git-p4: add support for large file systems

2015-09-03 Thread larsxschneider
From: Lars Schneider Diff to v1: Fixed: * simpler makedirs * remove temp file if git-lfs command failed * fix typos * remove uneccessary sub shell for (git lfs help) * make TC not dependable on hashes Thanks Luke for the feedback! Added: * new gitConfigInt function *

Re: Default ordering of git log output

2015-09-03 Thread Junio C Hamano
Kirill Likhodedov writes: > Is it intended behavior that the default git log output (without > ordering parameters) can show parents before children? > > The man says: > Commit Ordering >By default, the commits are shown in reverse chronological order. >

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Karthik Nayak
On Thu, Sep 3, 2015 at 8:35 PM, Matthieu Moy wrote: > Eric Sunshine writes: > >> Also, if 'buf' is indeed unconditionally NUL-terminated, then the (sp >> <= buf + size) check is wasted code since the result of strstr() will >> always be

[PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/git-p4.py b/git-p4.py index 073f87b..c139cab 100755 --- a/git-p4.py +++ b/git-p4.py @@ -604,9

[PATCH v2 3/4] git-p4: return an empty list if a list config has no values

2015-09-03 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index ae1a4d3..4d78e1c 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def

[PATCH v2 2/4] git-p4: add gitConfigInt reader

2015-09-03 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/git-p4.py b/git-p4.py index c139cab..ae1a4d3 100755 --- a/git-p4.py +++ b/git-p4.py @@ -623,6 +623,17 @@ def

Bug Report: git gui clones non-master default branch as master

2015-09-03 Thread John Medema
Git gurus, your assistance is needed. Environment #1: git version 2.5.0.windows.1 git-gui version 0.20.GITGUI Windows 7 Pro 64-bit Environment #2: git version 1.7.9.msysgit.0 git-gui version 0.16.GITGUI Windows Server 2003 R2 32-bit Environment #3: Linux (check with dscho,

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Karthik Nayak
On Thu, Sep 3, 2015 at 8:09 PM, Eric Sunshine wrote: > On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: >> In 'tag.c' we can print N lines from the annotation of the tag using >> the '-n' option. Copy code from 'tag.c' to 'ref-filter' and >>

[PATCH v2 4/4] git-p4: add support for large file systems

2015-09-03 Thread larsxschneider
From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as LFS [1] or git-annex [2] try to address this problem. Add a generic mechanism to detect

[PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread garga
From: Renato Botelho git-submodule and git-request-pull are written in sh but use perl internally. Add them to be replaced by unimplemented.sh when NO_PERL flag is set --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index

Re: [PATCH v1] t9821: use test_config

2015-09-03 Thread Junio C Hamano
Lars Schneider writes: > On 03 Sep 2015, at 15:04, Eric Sunshine wrote: > >> On Thu, Sep 3, 2015 at 5:34 AM, wrote: >>> From: Lars Schneider >>> >>> Signed-off-by: Lars Schneider

git bash bug: ipython doesn't work

2015-09-03 Thread Sergey Chipiga
I downloaded git for windows v2.5.1. And in git bash I can't launch ipython. I suppose it forwards stdout somethere. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH] graph.c: visual difference on subsequent series

2015-09-03 Thread Junio C Hamano
Michael J Gruber writes: >> Is the design of your independent implementation the same except >> that 'o' is used instead of 'x'? Independent implementation does >> not make the same design magically better, if that is the case ;-) > > Interestingly, the patch to the

Re: [PATCH v15 05/13] ref-filter: implement an `align` atom

2015-09-03 Thread Karthik Nayak
On Thu, Sep 3, 2015 at 7:42 PM, Eric Sunshine wrote: > On Tue, Sep 1, 2015 at 2:26 PM, Karthik Nayak wrote: >> Implement an `align` atom which left-, middle-, or right-aligns the >> content between %(align:..) and %(end). > > Spell this either

test

2015-09-03 Thread abgadvertising
hi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v6] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > +test_expect_success 'Clone repo containing iso8859-1 encoded paths without > git-p4.pathEncoding' ' > + git p4 clone --destination="$git" //depot && > + test_when_finished cleanup_git && > + ( > + cd "$git" && > +

Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

2015-09-03 Thread Junio C Hamano
Eric Sunshine writes: > Also, if 'buf' is indeed unconditionally NUL-terminated, then the (sp > <= buf + size) check is wasted code since the result of strstr() will > always be either NULL or pointing somewhere within the NUL-terminated > string. A caller can give a

Re: [PATCH v2 2/4] git-p4: add gitConfigInt reader

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 21:57, Luke Diamand wrote: > On 03/09/15 17:35, larsxschnei...@gmail.com wrote: >> From: Lars Schneider >> > > Explanation? Add a git config reader for integer variables. Please note that the git config implementation

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 22:18, Junio C Hamano wrote: > Lars Schneider writes: > >> On 03 Sep 2015, at 21:55, Luke Diamand wrote: >> >>> On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider

[PATCH v3 11/11] t6300: add tests for "-local" date formats

2015-09-03 Thread John Keeping
Signed-off-by: John Keeping --- Changes since v2: - "relative-local" and "raw-local" are now allowed t/t6300-for-each-ref.sh | 36 1 file changed, 36 insertions(+) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index

[PATCH v3 10/11] t6300: make UTC and local dates different

2015-09-03 Thread John Keeping
By setting the UTC time to 23:18:43 the date in +0200 is the following day, 2006-07-04. This will ensure that the test for "short-local" to be added in the following patch tests for different output from the "short" format. Signed-off-by: John Keeping ---

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread Junio C Hamano
Renato Botelho writes: >> You also may want to hold off the "git-submodule" bit, as I expect >> http://thread.gmane.org/gmane.comp.version-control.git/277128/focus=277129 >> would be one of the first changes to be in 'master' after the >> upcoming release 2.6 (that is, it is

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread Luke Diamand
On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider I think this commit may need some explanation! Signed-off-by: Lars Schneider --- git-p4.py | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread Junio C Hamano
Lars Schneider writes: > On 03 Sep 2015, at 21:55, Luke Diamand wrote: > >> On 03/09/15 17:35, larsxschnei...@gmail.com wrote: >>> From: Lars Schneider >>> >> >> I think this commit may need some explanation! > > The

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread Junio C Hamano
Lars Schneider writes: > In case I agree with a reviewer. What is the more appropriate action? > A response like the one above or a new role that includes the change > right away? I don’t want to spam the list with lots of tiny changes… Responding to review comment

Re: git bash bug: ipython doesn't work

2015-09-03 Thread Johannes Schindelin
Hi Sergey, On 2015-09-03 18:56, Sergey Chipiga wrote: > I downloaded git for windows v2.5.1. And in git bash I can't launch ipython. > I suppose it forwards stdout somethere. I replied in the ticket you opened on GitHub: https://github.com/git-for-windows/git/issues/352 Ciao, Johannes -- To

Re: [PATCH v2 4/4] git-p4: add support for large file systems

2015-09-03 Thread Luke Diamand
On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as LFS [1] or git-annex [2] try to

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread Renato Botelho
> On Sep 3, 2015, at 16:56, Junio C Hamano wrote: > > Renato Botelho writes: > >>> You also may want to hold off the "git-submodule" bit, as I expect >>> http://thread.gmane.org/gmane.comp.version-control.git/277128/focus=277129 >>> would be one of the

[PATCH v3 02/11] Documentation/config: don't list date formats

2015-09-03 Thread John Keeping
This list is already incomplete (missing "raw") and we're about to add new formats. Since this option sets a default for git-log's --date option, just refer to git-log(1). Signed-off-by: John Keeping --- Documentation/config.txt | 4 +--- 1 file changed, 1 insertion(+), 3

[PATCH v3 03/11] Documentation/git-for-each-ref: don't list date formats

2015-09-03 Thread John Keeping
We are about to add a new set of supported date formats and do not want to have to maintain the same list in several different bits of documentation. Refer to git-rev-list(1) which contains the full list of supported formats. Signed-off-by: John Keeping ---

[PATCH v3 01/11] Documentation/blame-options: don't list date formats

2015-09-03 Thread John Keeping
This list is already incomplete (missing "raw") and we're about to add new formats. Remove it and refer to the canonical documentation in git-log(1). Signed-off-by: John Keeping --- Documentation/blame-options.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

[PATCH v3 00/11] Make "local" orthogonal to date format

2015-09-03 Thread John Keeping
Since version 2 there are four new preparatory patches which remove lists of date formats from documentation in favour of referring to the detailed list in git-rev-list(1) or git-log(1) (both generated from Documentation/rev-list-options.txt) depending on whether the page in question is

Re: glibc mutex deadlock in signal handler

2015-09-03 Thread Andreas Schwab
See for the complete list of functions you may safely call from a signal handler. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5

Re: [PATCH v2 2/4] git-p4: add gitConfigInt reader

2015-09-03 Thread Luke Diamand
On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider Explanation? Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11 insertions(+) diff --git a/git-p4.py b/git-p4.py index

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

2015-09-03 Thread Junio C Hamano
ga...@freebsd.org writes: > From: Renato Botelho > > git-submodule and git-request-pull are written in sh but use perl > internally. Add them to be replaced by unimplemented.sh when NO_PERL > flag is set > > Signed-off-by: Renato Botelho > --- > Makefile |

Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader

2015-09-03 Thread Lars Schneider
On 03 Sep 2015, at 21:55, Luke Diamand wrote: > On 03/09/15 17:35, larsxschnei...@gmail.com wrote: >> From: Lars Schneider >> > > I think this commit may need some explanation! The functions “gitConfig” and “gitConfigBool” are almost identical.

Re: [PATCH v2 2/4] git-p4: add gitConfigInt reader

2015-09-03 Thread Luke Diamand
On 03/09/15 21:17, Lars Schneider wrote: On 03 Sep 2015, at 21:57, Luke Diamand wrote: On 03/09/15 17:35, larsxschnei...@gmail.com wrote: From: Lars Schneider Explanation? Add a git config reader for integer variables. Please note that the

[PATCH v3 05/11] fast-import: switch crash-report date to iso8601

2015-09-03 Thread John Keeping
From: Jeff King When fast-import emits a crash report, it does so in the user's local timezone. But because we omit the timezone completely for DATE_LOCAL, a reader of the report does not immediately know which time zone was used. Let's switch this to ISO8601 instead, which

[PATCH v3 04/11] Documentation/rev-list: don't list date formats

2015-09-03 Thread John Keeping
We are about to add several new date formats which will make this list too long to display in a single line. Signed-off-by: John Keeping --- Documentation/git-rev-list.txt | 2 +- Documentation/rev-list-options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

[PATCH v3 07/11] t6300: add test for "raw" date format

2015-09-03 Thread John Keeping
Signed-off-by: John Keeping --- t/t6300-for-each-ref.sh | 4 1 file changed, 4 insertions(+) diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 0bf709b..6afcff6 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -215,6 +215,10 @@

[PATCH v3 06/11] t6300: introduce test_date() helper

2015-09-03 Thread John Keeping
This moves the setup of the "expected" file inside the test case. The helper function has the advantage that we can use SQ in the file content without needing to escape the quotes. Signed-off-by: John Keeping --- Changes since v2: - add missing "&&" after "f=$1" - wrap long

[PATCH v3 09/11] date: make "local" orthogonal to date format

2015-09-03 Thread John Keeping
From: Jeff King Most of our "--date" modes are about the format of the date: which items we show and in what order. But "--date=local" is a bit of an oddball. It means "show the date in the normal format, but using the local timezone". The timezone we use is orthogonal to the

[PATCH v3 08/11] date: check for "local" before anything else

2015-09-03 Thread John Keeping
In a following commit we will make "local" orthogonal to the format. Although this will not apply to "relative", which does not use the timezone, it applies to all other formats so move the timezone conversion to the start of the function. Signed-off-by: John Keeping ---

Re: [PATCHv5 3/3] submodule: Reimplement `module_clone` shell function in C

2015-09-03 Thread Junio C Hamano
Stefan Beller writes: > @@ -119,6 +120,140 @@ static int module_name(int argc, const char **argv, > const char *prefix) > > return 0; > } > +static int clone_submodule(const char *path, const char *gitdir, const char > *url, > +const char

Re: [PATCH] graph.c: visual difference on subsequent series

2015-09-03 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 27.07.2015 22:17: > Antoine Beaupré writes: > >> Any reason why this patch wasn't included / reviewed? >> ... >>> This patch is similar than the one provided by Milton Soares Filho in >>>

[PATCH v6] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread larsxschneider
From: Lars Schneider Diff to v5: * use "test_config" (Thanks Remi! I am still learning all the tools...) * removed whitespaces (Thanks Luke! I added this to my "generate patch" script. Won't happen again :-) * added ACK from Luke (I interpreted "Looks good to me" that

Re: Git Deployment Multiple Existing Environments

2015-09-03 Thread Thomas Koch
On Thursday, September 03, 2015 09:11:10 AM Sukhwinder Singh wrote: > Hello, > > I have posted this question on various forums as well but I have not > received any guidance yet. I was requesting some steps which I can follow. > Our Servers are windows based. Don't use windows. Get rid of people

Re: [PATCH] pack-protocol: clarify LF-handling in PKT-LINE()

2015-09-03 Thread Jeff King
On Thu, Sep 03, 2015 at 04:24:09AM -0400, Jeff King wrote: > diff --git a/Documentation/technical/protocol-common.txt > b/Documentation/technical/protocol-common.txt > index 889985f..bf30167 100644 > --- a/Documentation/technical/protocol-common.txt > +++

Re: [PATCH v5] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread Remi Galan Alfonso
Hi Lars, Lars Schneider writes: > +test_expect_success 'Clone repo containing iso8859-1 encoded paths with > git-p4.pathEncoding' ' > + > +test_when_finished cleanup_git && > +( > +cd "$git" && > +git init . && > +

[PATCH] pack-protocol: document newline behavior in push commands

2015-09-03 Thread Jeff King
Our pack-protocol spec indicates that a pushing client should send ref update commands like: $old_sha1 $new_sha1 $ref\n with each ref update in its own pktline, with a trailing newline. However, git itself does not follow this behavior; it omits the trailing newline. For the most part the

[PATCH] pack-protocol: clarify LF-handling in PKT-LINE()

2015-09-03 Thread Jeff King
On Thu, Sep 03, 2015 at 04:02:05AM -0400, Jeff King wrote: > I'm also tempted to scrap this and say it just falls under the rule > that every PKT-LINE is "sender SHOULD include LF" and "receiver MUST NOT > complain about missing LF" (which does appear earlier in the document, > though in a

[PATCH v1] t9821: use test_config

2015-09-03 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- t/t9821-git-p4-path-variations.sh | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/t/t9821-git-p4-path-variations.sh b/t/t9821-git-p4-path-variations.sh

[PATCH v1] t9821: use test_config

2015-09-03 Thread larsxschneider
From: Lars Schneider Thanks Remi for pointing out test_config to me! Cheers, Lars Lars Schneider (1): t9821: use test_config t/t9821-git-p4-path-variations.sh | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- 1.9.5 (Apple Git-50.3) -- To

Re: git dockerfile.

2015-09-03 Thread Atul Sowani
Hello! Any help/pointers/advise regarding my request about dockerfile? Thanks, Atul. On Tue, Sep 1, 2015 at 3:13 PM, Atul Sowani wrote: > Hi, > > Greetings everybody! > > I am looking for a Dockerfile for git which will _build_ git from source on > ppc64le platform. I want to

[PATCH v6] git-p4: add config git-p4.pathEncoding

2015-09-03 Thread larsxschneider
From: Lars Schneider Perforce keeps the encoding of a path as given by the originating OS. Git expects paths encoded as UTF-8. Add a config to tell git-p4 what encoding Perforce had used for the paths. This encoding is used to transcode the paths to UTF-8. As an

On a personal note

2015-09-03 Thread Johannes Schindelin
Hey all, yes, it is true: since mid-August I am working for Microsoft. Over a year ago, I got into contact with the Visual Studio Online group at Microsoft, of which I am now a happy member. A large part of my mission is to improve the experience of Git for Windows. This is very exciting to me: I

Re: GSoC 2015 is over

2015-09-03 Thread Christian Couder
Hi, On Thu, Sep 3, 2015 at 12:46 AM, Johannes Schindelin wrote: > Hi, > > On Wed, 2 Sep 2015, Paul Tan wrote: > >> On Wed, Sep 2, 2015 at 12:55 AM, Matthieu Moy >> wrote: >> > I consider this GSoC as a great success and a pleasant

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

2015-09-03 Thread Luke Diamand
>>> >>> Regarding Python 3: >>> Would you drop Python 2 support or do you want to support Python 2/3 in >>> parallel? I would prefer the former… >> >> For quite some time we would need to support both; we can't just have >> a release of git that one day breaks git-p4 for people stuck on Python >>

glibc mutex deadlock in signal handler

2015-09-03 Thread Takashi Iwai
Hi, we've got a bug report of git-log stall in below: https://bugzilla.opensuse.org/show_bug.cgi?id=942297 In short, git-log is left unterminated sometimes when pager is aborted. When this happens, git process can't be killed by SIGTERM, but only by SIGKILL. And, further investigation

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

2015-09-03 Thread Lars Schneider
On 30 Aug 2015, at 18:36, Luke Diamand wrote: > On 30 August 2015 at 11:18, Lars Schneider wrote: >> Thanks for your feedback! >> >> I like the “handle big files” plugin kind of idea. However, I wonder if it >> makes sense to put more and more

Re: [RFC PATCH] git-p4: add option to store files in Git LFS on import

2015-09-03 Thread John Keeping
On Thu, Sep 03, 2015 at 11:40:20AM +0200, Lars Schneider wrote: > > On 30 Aug 2015, at 18:36, Luke Diamand wrote: > > > On 30 August 2015 at 11:18, Lars Schneider wrote: > >> Thanks for your feedback! > >> > >> I like the “handle big files” plugin

Re: git svn clone fails

2015-09-03 Thread Jörg Schaible
Hi Eric, Eric Wong wrote: > Jörg Schaible wrote: >> Is there really no other place for a bug report? This will simply vanish >> in the list's noise ... > > These messages do get seen and read. (And I would not have seen this > message if it were posted anywhere

Re: [PATCH 00/43] refs lmdb backend

2015-09-03 Thread Junio C Hamano
David Turner writes: > I think I've broken about all of the standalone stuff out, so here's > the main enchilada. > > This series depends on at least the following topics in pu: > dt/refs-bisection > dt/refs-pseudo > dt/reflog-tests > kn/for-each-tag (patch 21 and

Re: [PATCH 01/43] refs.c: create a public version of verify_refname_available

2015-09-03 Thread Junio C Hamano
David Turner writes: > @@ -2827,7 +2831,7 @@ int pack_refs(unsigned int flags) > * > * The refs in 'refnames' needn't be sorted. `err` must not be NULL. > */ > -static int repack_without_refs(struct string_list *refnames, struct strbuf > *err) > +int

Re: [PATCH 42/43] refs: add LMDB refs backend

2015-09-03 Thread Junio C Hamano
David Turner writes: > Add a database backend for refs using LMDB. This backend runs git > for-each-ref about 30% faster than the files backend with fully-packed > refs on a repo with ~120k refs. Nice ;-) -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH v3 08/11] date: check for "local" before anything else

2015-09-03 Thread Junio C Hamano
John Keeping writes: > In a following commit we will make "local" orthogonal to the format. > Although this will not apply to "relative", which does not use the > timezone, it applies to all other formats so move the timezone > conversion to the start of the function.

Re: [PATCH] pack-protocol: document newline behavior in push commands

2015-09-03 Thread Junio C Hamano
Jeff King writes: > Frankly, this feels a bit like a step backwards to me. I am tempted to > suggest instead that git start sending the newlines, but I'm not sure > it's worth any potential fallout. I actually think we should do both in the longer term. If we say sender "SHOULD"

Re: [PATCH v3 04/11] Documentation/rev-list: don't list date formats

2015-09-03 Thread Junio C Hamano
John Keeping writes: > We are about to add several new date formats which will make this list > too long to display in a single line. > > Signed-off-by: John Keeping > --- > Documentation/git-rev-list.txt | 2 +- > Documentation/rev-list-options.txt

Re: [PATCHv5 3/3] submodule: Reimplement `module_clone` shell function in C

2015-09-03 Thread Eric Sunshine
On Wed, Sep 2, 2015 at 5:42 PM, Stefan Beller wrote: > This reimplements the helper function `module_clone` in shell > in C as `clone`. This functionality is needed for converting > `git submodule update` later on, which we want to add threading > to. > > Signed-off-by: Stefan

git grep broken in Fedora 21 update?

2015-09-03 Thread Rustad, Mark D
I just found a case where grep and git grep yield different results. Inside the ixgbe directory of the Linux kernel I did: $ grep enter_lplu *.[ch] And got the following: ixgbe_main.c: if (adapter->hw.phy.ops.enter_lplu) { ixgbe_main.c: adapter->hw.phy.ops.enter_lplu(>hw);

Re: [PATCH] pack-protocol: clarify LF-handling in PKT-LINE()

2015-09-03 Thread Junio C Hamano
Jeff King writes: > Since the discussion seemed to end up in this "let's make PKT-LINE more > clear" direction, here is an attempt to do that. Ah, I was confused while reading the other one ;-) Will queue this one instead. Thanks. > -- >8 -- > Subject: pack-protocol: clarify

Re: Feature Request: enhance Git-GUI's Checkout Branch screen

2015-09-03 Thread David Aguilar
On Thu, Sep 03, 2015 at 10:08:24AM -0700, John Medema wrote: > Git gurus, throw this one on your to-do list: > > This is a feature request to enhance the Git GUI to make it easier to > checkout non-existing branches that exist upstream. Apologies if this > is not the correct place for feature

Re: git grep broken in Fedora 21 update?

2015-09-03 Thread Jacob Keller
On Thu, Sep 3, 2015 at 5:04 PM, Rustad, Mark D wrote: > I just found a case where grep and git grep yield different results. Inside > the ixgbe directory of the Linux kernel I did: > > $ grep enter_lplu *.[ch] > > And got the following: > > ixgbe_main.c: if

Re: determine name of tag used for checkout when multiple tags exist?

2015-09-03 Thread Jacob Keller
On Thu, Sep 3, 2015 at 7:53 PM, Jesse Hopkins wrote: > > It seems to me that when checking out to a tag, Git does not record the > *name* of the tag anywhere, but rather sets HEAD to the de-referenced > commit SHA-1. As far as I can tell, it is not possible to recover the

Re: [PATCH/RFC] Pinning of submodules

2015-09-03 Thread Eric Sunshine
On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote: > Patch to make it possible to pin submodules so that they are not > affected by the --remote option in "git submodule". Thanks for the patches. I don't use submodules, so I can't comment specifically on this change,

  1   2   >