[PATCH v8] git-p4: Obey core.ignorecase when using P4 client specs

2015-08-27 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com I realized after reading the mailing list that my v7 was signed off twice. I fixed that in v8. Sorry for the spam, Lars Lars Schneider (1): git-p4: Obey core.ignorecase when using P4 client specs git-p4.py | 7 ++

Re: [PATCHv1 1/3] git-p4: failing test for ignoring invalid p4 labels

2015-08-27 Thread Eric Sunshine
On Thu, Aug 27, 2015 at 3:18 AM, Luke Diamand l...@diamand.org wrote: When importing a label which references a commit that git-p4 does not know about, git-p4 should skip it and go on to process other labels that can be imported. Instead it crashes when attempting to find the missing commit

[PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Some users might want to see diff (patch) output always rather than diffstat when [s]he runs 'git stash show'. Although this can be done with adding -p option, it'd be better to provide a config option to control this behavior IMHO. Signed-off-by: Namhyung Kim namhy...@gmail.com ---

Re: [PATCH 1/5] submodule: implement `module_clone` as a builtin helper

2015-08-27 Thread Johannes Schindelin
Hi Stefan, thank you so much for doing this. `git submodule` is really, really slow on Windows... On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 4b32a3c..f11fb9c 100644 --- a/builtin/submodule--helper.c +++

[PATCH v8] git-p4: Obey core.ignorecase when using P4 client specs

2015-08-27 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com Perforce depot may record paths in mixed cases, e.g. p4 files may show that there are these two paths: //depot/Path/to/file1 //depot/pATH/to/file2 and with p4 or p4v, these end up in the same directory, e.g. //depot/Path/to/file1

[PATCH v7] git-p4: Obey core.ignorecase when using P4 client specs

2015-08-27 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com Perforce depot may record paths in mixed cases, e.g. p4 files may show that there are these two paths: //depot/Path/to/file1 //depot/pATH/to/file2 and with p4 or p4v, these end up in the same directory, e.g. //depot/Path/to/file1

[PATCH v7] git-p4: Obey core.ignorecase when using P4 client specs

2015-08-27 Thread larsxschneider
From: Lars Schneider larsxschnei...@gmail.com I changed the commit message based on Junio's suggestion in the v6 thread and I changed the test case path names to match the commit message example. Thanks, Lars Lars Schneider (1): git-p4: Obey core.ignorecase when using P4 client specs

Re: [PATCH 2/5] thread-utils: add a threaded task queue

2015-08-27 Thread Johannes Schindelin
Hi Stefan, On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/run-command.c b/run-command.c index 28e1d55..cb15cd9 100644 --- a/run-command.c +++ b/run-command.c @@ -668,6 +668,22 @@ int git_atexit(void (*handler)(void)) #endif +void setup_main_thread(void) [...] diff --git

Re: [PATCH v13 05/12] ref-filter: add option to filter out tags, branches and remotes

2015-08-27 Thread Karthik Nayak
On Thu, Aug 27, 2015 at 8:54 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 08/27/2015 02:42 PM, Karthik Nayak wrote: On Wed, Aug 26, 2015 at 9:40 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 08/22/2015 05:39 AM, Karthik Nayak wrote: [...] + if (type == FILTER_REFS_BRANCHES)

Re: [PATCH 2/5] thread-utils: add a threaded task queue

2015-08-27 Thread Stefan Beller
On Thu, Aug 27, 2015 at 5:59 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Stefan, On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/run-command.c b/run-command.c index 28e1d55..cb15cd9 100644 --- a/run-command.c +++ b/run-command.c @@ -668,6 +668,22 @@ int

[PATCH] commit: don't rewrite shared index unnecessarily

2015-08-27 Thread David Turner
Remove a cache invalidation which would cause the shared index to be rewritten on as-is commits. When the cache-tree has changed, we need to update it. But we don't necessarily need to update the shared index. So setting active_cache_changed to SOMETHING_CHANGED is unnecessary. Instead, we let

Re: [PATCH v13 00/12] port tag.c to use ref-filter APIs

2015-08-27 Thread Karthik Nayak
On Thu, Aug 27, 2015 at 1:49 AM, Junio C Hamano gits...@pobox.com wrote: Karthik Nayak karthik@gmail.com writes: On Wed, Aug 26, 2015 at 8:07 PM, Junio C Hamano gits...@pobox.com wrote: ... You can give a new format_ref_array_item() that does not print but fills a strbuf to this caller,

[PATCH] Mingw: verify both ends of the pipe () call

2015-08-27 Thread Johannes Schindelin
From: jfmc jfm...@gmail.com The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales jfm...@gmail.com Signed-off-by: Johannes Schindelin

Re: [PATCH] Mingw: verify both ends of the pipe () call

2015-08-27 Thread Johannes Schindelin
Hi all, On 2015-08-27 17:55, Johannes Schindelin wrote: From: jfmc jfm...@gmail.com The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix the obvious copy-edit bug. Signed-off-by: Jose F. Morales

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Hi, On Fri, Aug 28, 2015 at 12:20 AM, SZEDER Gábor sze...@ira.uka.de wrote: Hi, I haven't made up my mind about this feature yet, but have a few comments about its implementation. Thanks for taking your time! diff --git a/git-stash.sh b/git-stash.sh index 1d5ba7a..8432435 100755 ---

[PATCH v2] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Some users might want to see diff (patch) output always rather than diffstat when [s]he runs 'git stash show'. Although this can be done with adding -p option, it'd be better to provide a config option to control this behavior IMHO. Signed-off-by: Namhyung Kim namhy...@gmail.com ---

[PATCH v2.1] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Some users might want to see diff (patch) output always rather than diffstat when [s]he runs 'git stash show'. Although this can be done with adding -p option, it'd be better to provide a config option to control this behavior IMHO. Signed-off-by: Namhyung Kim namhy...@gmail.com ---

Re: [PATCH v13 05/12] ref-filter: add option to filter out tags, branches and remotes

2015-08-27 Thread Michael Haggerty
On 08/27/2015 02:42 PM, Karthik Nayak wrote: On Wed, Aug 26, 2015 at 9:40 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 08/22/2015 05:39 AM, Karthik Nayak wrote: [...] + if (type == FILTER_REFS_BRANCHES) + ret = for_each_reftype_fullpath(ref_filter_handler,

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread SZEDER Gábor
Hi, I haven't made up my mind about this feature yet, but have a few comments about its implementation. diff --git a/git-stash.sh b/git-stash.sh index 1d5ba7a..8432435 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -33,6 +33,12 @@ else reset_color= fi +if git config --get

Bug with worktrees...

2015-08-27 Thread John Szakmeister
My apologies if this has already been reported, but I ran into an interesting bug with worktrees. In particular, I have an alias 'st' that maps to 'status -sb'. When running this under a subdirectory of a worktree created with 'git worktree add', it fails complaining that the work tree has

Hi

2015-08-27 Thread ntsf
This is Sandeep largest Mega Millions winner giving you some dollars reply with your full name and location. -- 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] Mingw: verify both ends of the pipe () call

2015-08-27 Thread Jonathan Nieder
Johannes Schindelin wrote: From: jfmc jfm...@gmail.com This means the name shown by git shortlog would be jfmc instead of Jose F. Morales. Intended? The code to open and test the second end of the pipe clearly imitates the code for the first end. A little too closely, though... Let's fix

Re: [PATCH 1/5] submodule: implement `module_clone` as a builtin helper

2015-08-27 Thread Stefan Beller
On Thu, Aug 27, 2015 at 5:36 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Stefan, thank you so much for doing this. `git submodule` is really, really slow on Windows... On 2015-08-27 02:52, Stefan Beller wrote: diff --git a/builtin/submodule--helper.c

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Junio C Hamano
Namhyung Kim namhy...@gmail.com writes: +stash.showFlag:: + The default option to pass to `git stash show` when no option is + given. The default is '--stat'. See description of 'show' command + in linkgit:git-stash[1]. Doesn't the same discussion in $gmane/275752 apply here?

[PATCH 9/9] pack-objects: Use new worker pool

2015-08-27 Thread Stefan Beller
Before we had n threads doing the delta finding work, and the main thread was load balancing the threads, i.e. moving work from a thread with a large amount left to an idle thread whenever such a situation arose. This moves the load balancing to the threads themselves. As soon as one thread is

[PATCH 3/9] submodule: implement `module_clone` as a builtin helper

2015-08-27 Thread Stefan Beller
`module_clone` is part of the update command, which I want to convert to C next. Signed-off-by: Stefan Beller sbel...@google.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/submodule--helper.c | 148 +++- git-submodule.sh| 80

[PATCH 6/9] submodule: helper to run foreach in parallel

2015-08-27 Thread Stefan Beller
Similar to `git submodule foreach` the new command `git submodule foreach_parallel` will run a command on each submodule. The commands are run in parallel up to the number of cores by default, or you can specify '-j 4' tun just run with 4 threads for example. One major difference to `git

[PATCH 1/9] submodule: implement `module_list` as a builtin helper

2015-08-27 Thread Stefan Beller
Most of the submodule operations work on a set of submodules. Calculating and using this set is usually done via: module_list $@ | { while read mode sha1 stage sm_path do # the actual operation done } Currently the function

[PATCH 7/9] fetch: fetch submodules in parallel

2015-08-27 Thread Stefan Beller
This makes use of the new task queue and the syncing feature of run-command to fetch a number of submodules at the same time. The output will look like it would have been run sequential, but faster. Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/fetch-options.txt | 7 +++

[PATCH 2/9] submodule: implement `module_name` as a builtin helper

2015-08-27 Thread Stefan Beller
This implements the helper `module_name` in C instead of shell, yielding a nice performance boost. Before this patch, I measured a time (best out of three): $ time ./t7400-submodule-basic.sh /dev/null real0m11.066s user0m3.348s sys 0m8.534s With this patch applied

[PATCH 8/9] index-pack: Use the new worker pool

2015-08-27 Thread Stefan Beller
This demonstrates how the new threading API may be used. There is no change in the workflow, just using the new threading API instead of keeping track of the pthreads ourselves. Signed-off-by: Stefan Beller sbel...@google.com --- builtin/index-pack.c | 23 --- 1 file changed,

[PATCH 5/9] run-command: add synced output

2015-08-27 Thread Stefan Beller
In the last patch we added an easy way to get a thread pool. Now if we want to run external commands from threads in the thread pool, the output will mix up between the threads. To solve this problem we protect the output via a mutex from becoming garbled. Each thread will try to acquire and

Re: Bug with worktrees...

2015-08-27 Thread Eric Sunshine
On Thu, Aug 27, 2015 at 3:03 PM, John Szakmeister j...@szakmeister.net wrote: My apologies if this has already been reported, but I ran into an interesting bug with worktrees. In particular, I have an alias 'st' that maps to 'status -sb'. When running this under a subdirectory of a worktree

git-send-email and IPv6-only host

2015-08-27 Thread Stéphane Graber
Hello, I've recently switched my home network to be IPv6-only, using NAT64 and DNS64 to reach IPv4 hosts. Pretty much everything I use day to day just kept on working fine, but I keep finding some small problems here and there, mostly to do with perl software. One of those is git-send-email

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Hi, On Thu, Aug 27, 2015 at 08:16:35PM -0400, Eric Sunshine wrote: On Thu, Aug 27, 2015 at 11:36 AM, Namhyung Kim namhy...@gmail.com wrote: On Fri, Aug 28, 2015 at 12:20 AM, SZEDER Gábor sze...@ira.uka.de wrote: - This hunk runs the the exact same 'git config' command twice. Run it

[PATCH 0/9] Progress with git submodule

2015-08-27 Thread Stefan Beller
This series replaces origin/sb/submodule-helper and is based on 5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5, (Merge 'hv/submodule-config' to 'sb/submodule-helper', which includes jk/git-path and hv/submodule-config) What changed? * The help text of the submodule--helper was adapted to our standard,

[PATCH 4/9] thread-utils: add a threaded task queue

2015-08-27 Thread Stefan Beller
This adds functionality to do work in a parallel threaded fashion while the boiler plate code for setting up threads and tearing them down as well as queuing up tasks is hidden behind the new API. Signed-off-by: Stefan Beller sbel...@google.com --- run-command.c | 39 +++-

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Namhyung Kim
Hi, On Thu, Aug 27, 2015 at 06:08:39PM -0700, Junio C Hamano wrote: Namhyung Kim namhy...@gmail.com writes: +stash.showFlag:: + The default option to pass to `git stash show` when no option is + given. The default is '--stat'. See description of 'show' command + in

Re: [PATCH] git-submodule: remove extraneous space from error message

2015-08-27 Thread Chris Packham
On Thu, Aug 27, 2015 at 4:26 PM, Alex Henrie alexhenri...@gmail.com wrote: Signed-off-by: Alex Henrie alexhenri...@gmail.com --- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-submodule.sh b/git-submodule.sh index 36797c3..25b1ddf 100755 ---

[PATCHv1 3/3] git-p4: fix P4 label import for unprocessed commits

2015-08-27 Thread Luke Diamand
With --detect-labels enabled, git-p4 will try to create tags using git fast-import by writing a tag clause to the fast-import stream. If the commit that the tag references has not yet actually been processed by fast-import, then the tag can't be created and git-p4 fails to import the P4 label.

[PATCHv1 1/3] git-p4: failing test for ignoring invalid p4 labels

2015-08-27 Thread Luke Diamand
When importing a label which references a commit that git-p4 does not know about, git-p4 should skip it and go on to process other labels that can be imported. Instead it crashes when attempting to find the missing commit in the git history. This test demonstrates the problem. Signed-off-by:

[PATCHv1 2/3] git-p4: do not terminate creating tag for unknown commit

2015-08-27 Thread Luke Diamand
If p4 reports a tag for a commit that git-p4 does not know about (e.g. because it references a P4 changelist that was imported prior to the point at which the repo was cloned into git), make sure that the error is correctly caught and handled. rather than just crashing. Signed-off-by: Luke

[PATCHv1 0/3] git-p4: fixing import with labels when commit is not transferred

2015-08-27 Thread Luke Diamand
Marcus Holl discovered that git-p4 fails to import labels sometimes. http://permalink.gmane.org/gmane.comp.version-control.git/273034 It turns out there are at least two related problems. The first is that if git-p4 tries to import a P4 tag which references a commit that we don't know about at

Re: [PATCH] stash: Add stash.showFlag config variable

2015-08-27 Thread Eric Sunshine
On Thu, Aug 27, 2015 at 11:36 AM, Namhyung Kim namhy...@gmail.com wrote: On Fri, Aug 28, 2015 at 12:20 AM, SZEDER Gábor sze...@ira.uka.de wrote: - This hunk runs the the exact same 'git config' command twice. Run it only once, perhaps something like this: show_flag=$(git config