Re: [PATCH v3 3/3] git-p4: Skip t9819 test case on case insensitive file systems

2015-10-11 Thread Luke Diamand
Looks good to me, Ack. On 11 October 2015 at 18:55, wrote: > From: Lars Schneider > > Windows and OS X file systems are case insensitive by default. > Consequently the "git-p4-case-folding" test case does not apply to > them. > > Signed-off-by: Lars Schneider > --- > t/t9819-git-p4-case-foldi

submodule: allow submodule directory in gitignore

2015-10-11 Thread Aleksey Komarov
Hi all! I'm sorry if the letter came twice. I have troubles with my post client. I want to organize my repository so its submodules would be located at the root of repository. I'm trying to create .gitignore to ignore all files and don't ignore directories at the same time: $ cat .gitignore * !*

Hacking git for managing machine readable "source" files

2015-10-11 Thread Christian Gagneraud
Hi git hackers, I have been scratching my head since quite a few weeks to see if and how I could hack git to manage non-software-source-code files. Theses files might be text-based (XML, JSON, custom format, ...) but are not intended for humans, thus diffing and merging them using standard git

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Junio C Hamano
Karthik Nayak writes: > On Fri, Oct 9, 2015 at 11:59 PM, Junio C Hamano wrote: > ... > Also does it make sense to integrate these changes here? Or would you like to > have another series on this? I do not think you would want to ask that question, as my answer would most likely be "The most pre

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-11 Thread Eric Sunshine
On Sun, Oct 11, 2015 at 1:55 PM, wrote: > From: Lars Schneider > > The tests are currently executed on "Ubuntu 12.04 LTS Server Edition > 64 bit" and on "OS X Mavericks" using gcc and clang. > > Perforce and Git-LFS are installed and therefore available for the > respective tests. > > Signed-off

Re: [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

2015-10-11 Thread Karthik Nayak
On Sun, Oct 11, 2015 at 11:40 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> A little blurry on how this works, as in how translation takes place, >> probably need to look at some code. > > What you really need to understand is: _("foo") is translated, "foo" is > not and will always be "foo

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Karthik Nayak
On Mon, Oct 12, 2015 at 1:02 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Sun, Oct 11, 2015 at 9:51 PM, Matthieu Moy >> wrote: >>> Karthik Nayak writes: >>> Also does it make sense to integrate these changes here? Or would you like to have another series on this? >>>

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > On Sun, Oct 11, 2015 at 9:51 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> Also does it make sense to integrate these changes here? Or would you like >>> to >>> have another series on this? >> >> To me, the important in this series is to avoid introducing du

Re: [PATCH 2/3] ref-filter: allow porcelain to translate messages in the output

2015-10-11 Thread Karthik Nayak
On Sun, Oct 11, 2015 at 9:46 PM, Matthieu Moy wrote: > This patch shows the way, but is obviously incomplete as it works only > for "nobracket" version. Actually, I think the code should first build > the unbracketed output string and then do something like > > if (!nobracket) { > const ch

[PATCH] git-multimail: update to release 1.2.0

2015-10-11 Thread Matthieu Moy
The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Elijah Newren Contributions-by: Edward d'Auvergne Contributions-by: Vadim Zeitlin Contributions-by: Paul Sokolovsky Contributions-by: Michael Haggerty Contributions-by: Elijah Newren Contributions-by: Ric

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Karthik Nayak
On Sun, Oct 11, 2015 at 9:51 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> Also does it make sense to integrate these changes here? Or would you like to >> have another series on this? > > To me, the important in this series is to avoid introducing duplicated > and inconsistent code, becau

Re: [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > A little blurry on how this works, as in how translation takes place, > probably need to look at some code. What you really need to understand is: _("foo") is translated, "foo" is not and will always be "foo". Technically, _ is a macro, it could be called get_the_translat

[PATCH v3 2/3] git-p4: Improve test case portability for t9815 git-p4-submit-fail

2015-10-11 Thread larsxschneider
From: Lars Schneider Replace the stats command with the ls command to check file mode bits. The stats command is not available on Windows and has different command line options on OS X. Signed-off-by: Lars Schneider --- t/t9815-git-p4-submit-fail.sh | 7 ++- 1 file changed, 2 insertions(+)

[PATCH v3 0/3] Add Travis CI support

2015-10-11 Thread larsxschneider
From: Lars Schneider diff to v2: * fix commit message to express what systems the Travis CI's infrastructure "currently" uses (thanks Dscho) * use `case` instead `if` syntax for OS detection (thanks Dscho) * remove unnessary DARWIN flag (thanks Junio) * use flag `case_insensitive_fs` to disable

[PATCH v3 3/3] git-p4: Skip t9819 test case on case insensitive file systems

2015-10-11 Thread larsxschneider
From: Lars Schneider Windows and OS X file systems are case insensitive by default. Consequently the "git-p4-case-folding" test case does not apply to them. Signed-off-by: Lars Schneider --- t/t9819-git-p4-case-folding.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t9819-git-p4

[PATCH v3 1/3] Add Travis CI support

2015-10-11 Thread larsxschneider
From: Lars Schneider The tests are currently executed on "Ubuntu 12.04 LTS Server Edition 64 bit" and on "OS X Mavericks" using gcc and clang. Perforce and Git-LFS are installed and therefore available for the respective tests. Signed-off-by: Lars Schneider --- .travis.yml | 46 ++

Re: [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

2015-10-11 Thread Karthik Nayak
On Sun, Oct 11, 2015 at 9:42 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Fri, Oct 9, 2015 at 12:10 AM, Matthieu Moy >> wrote: >>> Karthik Nayak writes: >>> --- a/ref-filter.c +++ b/ref-filter.c @@ -1118,8 +1118,10 @@ static void populate_value(struct ref_array_item >

Re: [PATCH v2 04/10] ref-filter: modify "%(objectname:short)" to take length

2015-10-11 Thread Karthik Nayak
On Sun, Oct 11, 2015 at 9:35 PM, Matthieu Moy wrote: > Karthik Nayak writes: > diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 7c9bec7..6fc569e 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -385,6 +385,28 @@ test_expect_success

Re: can't install on OS X

2015-10-11 Thread krist333
Thanks for the summary. I have been googling this for a while until I found this and it worked for me. Just one note (possibly a minor typo): it should be *csrutil* disable/enable not scrutil reference: https://developer.apple.com/library/prerelease/mac/documentation/Security/Conceptual/System_I

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > Also does it make sense to integrate these changes here? Or would you like to > have another series on this? To me, the important in this series is to avoid introducing duplicated and inconsistent code, because it would make further refactoring harder. But this series st

[PATCH 1/3] fixup: use xstrfmt instead of fixed-size buf + sprintf + xstrdup

2015-10-11 Thread Matthieu Moy
The char buf[40] is safe (at least while the strings are not translated), but I'd rather avoid magic numbers like this 40 in the code, and use a construct that does not have this size limitation. Especially if it makes the code shorter. Signed-off-by: Matthieu Moy --- ref-filter.c | 20 -

[PATCH 3/3] branch, tag: use porcelain output

2015-10-11 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- builtin/branch.c | 2 ++ builtin/tag.c| 2 ++ 2 files changed, 4 insertions(+) diff --git a/builtin/branch.c b/builtin/branch.c index 9d6c062..041c649 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -531,6 +531,8 @@ int cmd_branch(int argc, const char

[PATCH 2/3] ref-filter: allow porcelain to translate messages in the output

2015-10-11 Thread Matthieu Moy
This patch shows the way, but is obviously incomplete as it works only for "nobracket" version. Actually, I think the code should first build the unbracketed output string and then do something like if (!nobracket) { const char *to_free = v->s; v->s = xstrfmt("[%s]", v->s);

Re: [PATCH v2 07/10] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > On Fri, Oct 9, 2015 at 12:10 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> --- a/ref-filter.c >>> +++ b/ref-filter.c >>> @@ -1118,8 +1118,10 @@ static void populate_value(struct ref_array_item >>> *ref) >>> char buf[40]; >>> >>>

Re: [PATCH v2 04/10] ref-filter: modify "%(objectname:short)" to take length

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: >>> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh >>> index 7c9bec7..6fc569e 100755 >>> --- a/t/t6300-for-each-ref.sh >>> +++ b/t/t6300-for-each-ref.sh >>> @@ -385,6 +385,28 @@ test_expect_success 'Check short objectname format' ' >>> test_cmp expected

thread-utils: build with NO_PTHREADS fails

2015-10-11 Thread Victor Leschuk
Hello all, I think that no one tried it for a long time but I needed a single-threaded git version for debug purpose. I tried to build with -DNO_PTHREADS and thread-utils.c failed to compile. In brief the situation is the following: in header file we have something like that: #ifndef NO_PTHR

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Karthik Nayak
On Fri, Oct 9, 2015 at 11:59 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> Then used_atom[] could become something like >>> >>> struct { >>> const char *str; /* e.g. "align:position=left,32" */ >>> struct { >>> const char *part0; /

RE: [PATCH] git-svn: make batch mode optional for git-cat-file

2015-10-11 Thread Victor Leschuk
Hello Eric, Thanks for all the advices. I have played with several repositories (both on 32bit and 64bit machines). You were correct most of the memory if used by mapped files and yes it doesn't cause any problems, even a 32bit machine with 500Mb of memory works normally with a heavy loaded git

Re: [PATCH v3 0/4] Fix locking issues on Windows with `git clone --dissociate`

2015-10-11 Thread Max Kirillov
On Tue, Oct 06, 2015 at 03:17:36PM +0200, Johannes Schindelin wrote: > This is version 3, adding that BUG! message if do_not_close was set. > > Max, I still hope that this patch series helps also your use case! Thanks, this mostly makes gone one of my commits. I only need to invoke the function a

Re: Draft of Git Rev News edition 8

2015-10-11 Thread Christian Couder
On Sun, Oct 11, 2015 at 1:45 AM, Eric Sunshine wrote: > On Sat, Oct 10, 2015 at 7:36 PM, Christian Couder > wrote: >> A draft of Git Rev News edition 8 is available here: >> https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-8.md > > Does Karsten's comprehensive post[1] abou