Re: [PATCH] t7300: fix broken && chains

2015-08-31 Thread erik elfström
On Mon, Aug 31, 2015 at 6:58 PM, Junio C Hamano wrote: > > Many of the constructs we see here shows clearly that this is an > ancient part of the codebase ;-), as we would be using the one > parameter form of "git init" and more test_* helpers if we were > writing this script in today's Git codeba

Re: [PATCH] t7300: fix broken && chains

2015-08-31 Thread erik elfström
On Mon, Aug 31, 2015 at 8:54 PM, Jeff King wrote: > On Sun, Aug 30, 2015 at 11:18:09AM +0200, Erik Elfström wrote: > > Unfortunately CHAIN_LINT cannot reach inside a nested subshell. I cannot > think of a way to make it do so, and besides, that is also the way to > override the &&-chain precedence

Re: [PATCH v3] git-p4: add "--path-encoding" option

2015-08-31 Thread Torsten Bögershausen
On 01/09/15 00:10, larsxschnei...@gmail.com wrote: From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt| 5 + git-p4.py | 6 ++ t/t9821-git-p4-path-encoding.sh | 38 ++ 3 files changed

Re: [PATCHv3 3/3] submodule: implement `module-clone` as a builtin helper

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 8:40 PM, Stefan Beller wrote: > This converts implements the helper `module_clone`. This functionality is "converts implements"? > needed for converting `git submodule update` later on, which we want to > add threading to. > > Signed-off-by: Stefan Beller > --- > +static

Re: [PATCHv3 2/3] submodule: implement `module-name` as a builtin helper

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 8:40 PM, Stefan Beller wrote: > 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

Re: [PATCHv3 1/3] submodule: implement `module-list` as a builtin helper

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 8:40 PM, Stefan Beller wrote: > 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

[PATCH v5 3/3] refs: make refs/bisect/* per-worktree

2015-08-31 Thread David Turner
We need the place we stick refs for bisects in progress to not be shared between worktrees. So we make the refs/bisect/ hierarchy per-worktree. The is_per_worktree_ref function and associated docs learn that refs/bisect/ is per-worktree, as does the git_path code in path.c The ref-packing functi

[PATCH v5 1/3] refs: clean up common_list

2015-08-31 Thread David Turner
Instead of common_list having formatting like ! and /, use a struct to hold common_list data in a structured form. We don't use 'exclude' yet; instead, we keep the old codepath that handles info/sparse-checkout and logs/HEAD. Later, we will use exclude. Signed-off-by: David Turner Signed-off-by

[PATCH v5 2/3] path: optimize common dir checking

2015-08-31 Thread David Turner
Instead of a linear search over common_list to check whether a path is common, use a trie. The trie search operates on path prefixes, and handles excludes. Signed-off-by: David Turner Signed-off-by: Junio C Hamano --- path.c| 227 ++--

[no subject]

2015-08-31 Thread David Turner
This version of the patch series squashes in Junio's comment fix and the xstrndup fix. In addition, it removes refs/worktree, and just makes refs/bisect per-worktree. If we later discover that other things need to be per-worktree, we can do refs/worktree, but for now, this is backwards-compatible

Re: [PATCHv3 0/3] submodule--helper: Have some refactoring only patches first

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 8:40 PM, Stefan Beller wrote: > * Implemented different error messages as suggested by Junio > * Implemented all of Erics suggestions, > including renaming to module-with-dash-now In the future, please include an interdiff showing changes between versions. Thanks. > Ste

[PATCHv3 3/3] submodule: implement `module-clone` as a builtin helper

2015-08-31 Thread Stefan Beller
This converts implements the helper `module_clone`. This functionality is needed for converting `git submodule update` later on, which we want to add threading to. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 144 +++- git-submodule.sh

[PATCHv3 1/3] submodule: implement `module-list` as a builtin helper

2015-08-31 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 `module_

[PATCHv3 2/3] submodule: implement `module-name` as a builtin helper

2015-08-31 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

[PATCHv3 0/3] submodule--helper: Have some refactoring only patches first

2015-08-31 Thread Stefan Beller
* Implemented different error messages as suggested by Junio * Implemented all of Erics suggestions, including renaming to module-with-dash-now Stefan Beller (3): submodule: implement `module-list` as a builtin helper submodule: implement `module-name` as a builtin helper submodule: implem

What's cooking in git.git (Aug 2015, #06; Mon, 31)

2015-08-31 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A handful of topics have been merged to 'master'. Because there still are a few obviously good and trivially safe fixes cooking in 'next', it w

Re: [PATCH v3] git-p4: add "--path-encoding" option

2015-08-31 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > Here is a space for you to describe what it does and why it is a good idea to have it. > Signed-off-by: Lars Schneider > --- > Documentation/git-p4.txt| 5 + > git-p4.py | 6 ++ > t/t9821-git-p4-

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

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 3:19 PM, Stefan Beller wrote: > `module_clone` is part of the update command, > which I want to convert to C next. Hmm, place commentary below "---". > Signed-off-by: Stefan Beller > Signed-off-by: Junio C Hamano > --- > diff --git a/builtin/submodule--helper.c b/builti

[PATCH v3] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt| 5 + git-p4.py | 6 ++ t/t9821-git-p4-path-encoding.sh | 38 ++ 3 files changed, 49 insertions(+) create mode 100755 t/t9821-git-p4-path-

[PATCH v3] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Diff to v2: * remove comment * use "core.quotepath false" to simplify test case Unit test passed on OS X and Linux. The unit test did also pass on v2 as "printf $(git ls-files) >actual" removes the LF. Cheers, Lars Lars Schneider (1): git-p4: add "--path-encoding" optio

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

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 05:33:37PM -0400, Jeff King wrote: > > diff --git a/date.c b/date.c > > index aa57cad..3aa8002 100644 > > --- a/date.c > > +++ b/date.c > > @@ -817,9 +817,7 @@ void parse_date_format(const char *format, struct > > date_mode *mode) > > if (!skip_prefix(p, ":", &

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

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 3:19 PM, Stefan Beller wrote: > This implements the helper `module_name` in C instead of shell, > yielding a nice performance boost. > > Signed-off-by: Stefan Beller > Signed-off-by: Junio C Hamano > --- > diff --git a/builtin/submodule--helper.c b/builtin/submodule--help

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

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 3:19 PM, Stefan Beller wrote: > 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

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 3:54 PM, Mike Rappazzo wrote: > On Mon, Aug 31, 2015 at 3:47 PM, Eric Sunshine > wrote: >> On Mon, Aug 31, 2015 at 2:57 PM, Mike Rappazzo wrote: >>> I wasn't sure that a bare repo would be considered a worktree. I >>> don't think that it would be >>> a good idea to incl

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

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 10:27:54PM +0100, John Keeping wrote: > This fails t6300 with: > > fatal: unknown date-mode modifier: my date is %Y-%m-%d > not ok 83 - Check format of strftime date fields > # > # echo "my date is 2006-07-03" >expected && > # git for-each-ref \

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

2015-08-31 Thread John Keeping
On Mon, Aug 31, 2015 at 04:48:32PM -0400, Jeff King wrote: > 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

Re: [PATCH v2] git-p4: add "--path-encoding" option

2015-08-31 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Signed-off-by: Lars Schneider > --- > Documentation/git-p4.txt| 5 + > git-p4.py | 6 ++ > t/t9821-git-p4-path-encoding.sh | 39 +++ > 3 files changed, 50 inse

Re: [PATCH v2] git-p4: add "--path-encoding" option

2015-08-31 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Diff to v1: > * switch example conversions from cp1252 to iso8859-1 (thanks Torsten!) > * fix git-p4.txt line length and double dashes (thanks Junio!) > * remove bare UTF-8 sequence (thanks Junio!) > > As with v1, I ensured the unit test

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

2015-08-31 Thread Stefan Beller
On Mon, Aug 31, 2015 at 1:35 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> usage: >> - usage("git submodule--helper module_list\n"); >> + usage("git submodule--helper [module_list | module_name]\n"); > > To me, the above reads as if saying: > > The command takes one of the t

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

2015-08-31 Thread 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 actual format, and there is no reason

[PATCH 1/2] fast-import: switch crash-report date to iso8601

2015-08-31 Thread 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 includes the time zone. This does mean

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 09:00:16PM +0100, John Keeping wrote: > Are you willing to resend this as a proper patch? Yup. [1/2]: fast-import: switch crash-report date to iso8601 [2/2]: date: make "local" orthogonal to date format > I'm happy to build documentation & tests on top, although ther

[PATCH v2] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt| 5 + git-p4.py | 6 ++ t/t9821-git-p4-path-encoding.sh | 39 +++ 3 files changed, 50 insertions(+) create mode 100755 t/t9821-git-p4-path

[PATCH v2] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Diff to v1: * switch example conversions from cp1252 to iso8859-1 (thanks Torsten!) * fix git-p4.txt line length and double dashes (thanks Junio!) * remove bare UTF-8 sequence (thanks Junio!) As with v1, I ensured the unit test runs on OS X and Linux. I noticed one weird po

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

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: > usage: > - usage("git submodule--helper module_list\n"); > + usage("git submodule--helper [module_list | module_name]\n"); To me, the above reads as if saying: The command takes one of the two subcommands at this stage, module_list that does not take any

Re: [PATCHv2 0/3] submodule--helper: Have some refactoring only patches first

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: > One of the mistakes I made last week was mixing these quite stable patches > with highly RFC/WIP patches and not pointing out loud which is which. I think it was very clear which is which to people who have been following (which are the only people you would care about an

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread Christian Couder
On Mon, Aug 31, 2015 at 10:06 PM, Junio C Hamano wrote: > David Turner writes: > >>> Christian, thanks for raising this one. >>> >>> I do recall the thread and I might be the somebody like Michael you >>> remember, e.g. $gmane/275105---which did mention that "git bisect" >>> would not need changi

Re: [PATCH] read-cache: fix indentation in read_index_from

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: >> I'll queue it for this time, but in general, I'd prefer if people >> refrained from touching code only for style fixes in an area that is >> touched actively in topics, unless it is done inside a topic that >> has to touch that area of the code in order to do something mo

Re: [PATCH] git-p4: add "--path-encoding" option

2015-08-31 Thread Junio C Hamano
Torsten Bögershausen writes: > On 2015-08-31 19.40, Junio C Hamano wrote: >> larsxschnei...@gmail.com writes: > >>> +test_expect_success 'Create a repo containing cp1251 encoded paths' ' >>> + cd "$cli" && >>> + >>> + FILENAME="$(echo "a-¤_o-¶_u-¼.txt" | iconv -f utf-8 -t cp1252)" && >> ...

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread Junio C Hamano
David Turner writes: >> Christian, thanks for raising this one. >> >> I do recall the thread and I might be the somebody like Michael you >> remember, e.g. $gmane/275105---which did mention that "git bisect" >> would not need changing if we kept refs/bisect/. >> >> What was the reason why we ch

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread John Keeping
On Mon, Aug 31, 2015 at 02:50:18PM -0400, Jeff King wrote: > On Mon, Aug 31, 2015 at 10:28:24AM -0700, Junio C Hamano wrote: > > I am unhappy with the change to blame.c, and that is not because I > > do not want "blame" to be touched. > > > > The fact that this change has to touch it indicates tha

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread Junio C Hamano
Jeff King writes: > Yeah, my first instinct on seeing the bitfield was that it would > probably be much simpler to keep the enum pure, and add a bit to the > struct. A patch in that direction is below. ... I found it a much cleaner approach from my cursory look. John, what do you think? -- To u

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Mike Rappazzo
On Mon, Aug 31, 2015 at 3:47 PM, Eric Sunshine wrote: > On Mon, Aug 31, 2015 at 2:57 PM, Mike Rappazzo wrote: >> I wasn't sure that a bare repo would be considered a worktree. I >> don't think that it would be >> a good idea to include it. In the same vein that I can't checkout a >> branch in a

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread David Turner
On Mon, 2015-08-31 at 15:03 -0400, Eric Sunshine wrote: > On Mon, Aug 31, 2015 at 2:44 PM, David Turner > wrote: > > On Mon, 2015-08-31 at 01:11 -0400, Eric Sunshine wrote: > >> Stepping back a bit, is a for-each-foo()-style interface desirable? > >> This sort of interface imposes a good deal of

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 2:57 PM, Mike Rappazzo wrote: > I wasn't sure that a bare repo would be considered a worktree. I > don't think that it would be > a good idea to include it. In the same vein that I can't checkout a > branch in a bare repo, it > figure that it shouldn't be in the list. I

Re: [PATCH] read-cache: fix indentation in read_index_from

2015-08-31 Thread Stefan Beller
On Mon, Aug 31, 2015 at 12:29 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> read-cache.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/read-cache.c b/read-cache.c >> index 89dbc08..a3df665 100644 >> --- a/read-cache.c

Re: [PATCH] read-cache: fix indentation in read_index_from

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > read-cache.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/read-cache.c b/read-cache.c > index 89dbc08..a3df665 100644 > --- a/read-cache.c > +++ b/read-cache.c > @@ -1653,7 +1653,7 @@ int read_index_from(st

Re: [PATCH] git-p4: add "--path-encoding" option

2015-08-31 Thread Torsten Bögershausen
On 2015-08-31 19.40, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: >> +test_expect_success 'Create a repo containing cp1251 encoded paths' ' >> +cd "$cli" && >> + >> +FILENAME="$(echo "a-¤_o-¶_u-¼.txt" | iconv -f utf-8 -t cp1252)" && > > Hmm, we'd be better off not having a bar

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 2:57 PM, Mike Rappazzo wrote: > On Mon, Aug 31, 2015 at 1:11 AM, Eric Sunshine > wrote: >> On Sun, Aug 30, 2015 at 3:10 PM, Michael Rappazzo wrote: >> Why does this iteration function specially filter out a bare main >> worktree? If it instead unconditionally vends the m

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

2015-08-31 Thread Stefan Beller
`module_clone` is part of the update command, which I want to convert to C next. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/submodule--helper.c | 148 +++- git-submodule.sh| 80 +--- 2 files cha

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

2015-08-31 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 `module_

[PATCHv2 0/3] submodule--helper: Have some refactoring only patches first

2015-08-31 Thread Stefan Beller
This patch series is the first part of the larger series I sent daily last week and contains only those patches which have had good review by Jeff, Dscho and Junio doing only internal refactoring, not introducing any parallelism yet. It replaces all patches on top of (5a1ba6b48a62b, Merge 'hv/submo

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

2015-08-31 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

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

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 11:56:04AM -0700, Junio C Hamano wrote: > Stefan Beller writes: > > > +static void destroy_output_mutex() > > static void destroy_output_mutex(void) Yep. Stefan, you may want to beef up the warning flags in your config.mak. For reference, I use: CFLAGS += -Wall -Werr

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 2:44 PM, David Turner wrote: > On Mon, 2015-08-31 at 01:11 -0400, Eric Sunshine wrote: >> Stepping back a bit, is a for-each-foo()-style interface desirable? >> This sort of interface imposes a good deal of complexity on callers, >> demanding a callback function and callbac

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Mike Rappazzo
On Mon, Aug 31, 2015 at 1:11 AM, Eric Sunshine wrote: > Thanks for working on this. I apologize for not reviewing earlier > rounds (other than v2 [1]); it's been difficult to find a block of > time to do so... I appreciate your time and comments. > > On Sun, Aug 30, 2015 at 3:10 PM, Michael Rapp

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 02:50:18PM -0400, Jeff King wrote: > diff --git a/fast-import.c b/fast-import.c > index 6c7c3c9..b19a1b5 100644 > --- a/fast-import.c > +++ b/fast-import.c > @@ -412,6 +412,10 @@ static void write_crash_report(const char *err) > struct branch *b; > unsigned long

Re: [PATCH v4 2/4] path: optimize common dir checking

2015-08-31 Thread David Turner
On Sun, 2015-08-30 at 08:25 +0200, Torsten Bögershausen wrote: > On 26.08.15 21:46, David Turner wrote: > > Instead of a linear search over common_list to check whether > > a path is common, use a trie. The trie search operates on > > path prefixes, and handles excludes. > > > > Signed-off-by: Da

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

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: > +static void destroy_output_mutex() static void destroy_output_mutex(void) > +{ > + pthread_mutex_destroy(&output_mutex); > +} > + > +#else > +#define set_output_mutex() > +#define destroy_output_mutex() > +#define lock_output_mutex() > +#define unlock_output_mutex()

Re: [PATCH] t7300: fix broken && chains

2015-08-31 Thread Jeff King
On Sun, Aug 30, 2015 at 11:18:09AM +0200, Erik Elfström wrote: > While we are here, remove some boilerplate by using test_commit. Darn, I thought we were done finding these after flipping on GIT_TEST_CHAIN_LINT. :) > diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh > index 27557d6..86ceb38 10075

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

2015-08-31 Thread Junio C Hamano
Stefan Beller writes: > + char *s = (char*)sm_gitdir; char *s = (char *)sm_gitdir; Many other places have similar, also in 7/9. -- 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 h

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread Jeff King
On Mon, Aug 31, 2015 at 10:28:24AM -0700, Junio C Hamano wrote: > This needs to be CC'ed to the author of a5481a6c (convert "enum > date_mode" into a struct, 2015-06-25), which I just did. Thanks. I'm definitely interested. > I am unhappy with the change to blame.c, and that is not because I > d

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread David Turner
On Mon, 2015-08-31 at 01:11 -0400, Eric Sunshine wrote: > Stepping back a bit, is a for-each-foo()-style interface desirable? > This sort of interface imposes a good deal of complexity on callers, > demanding a callback function and callback data (cb_data), and is > generally (at least in C) more d

[PATCH] read-cache: fix indentation in read_index_from

2015-08-31 Thread Stefan Beller
Signed-off-by: Stefan Beller --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index 89dbc08..a3df665 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1653,7 +1653,7 @@ int read_index_from(struct index_state *istate, const char *path

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

2015-08-31 Thread David Turner
On Mon, 2015-08-31 at 17:02 +0700, Duy Nguyen wrote: > On Fri, Aug 28, 2015 at 12:07 AM, David Turner > wrote: > > 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 > >

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread David Turner
On Mon, 2015-08-31 at 07:36 -0700, Junio C Hamano wrote: > Christian Couder writes: > > >> * dt/refs-bisection (2015-08-28) 5 commits > >> - bisect: make bisection refs per-worktree > >> - refs: make refs/worktree/* per-worktree > >> - SQUASH??? > >> - path: optimize common dir checking > >>

Re: [PATCH v3] trailer: support multiline title

2015-08-31 Thread Christian Couder
On Mon, Aug 31, 2015 at 8:13 PM, Junio C Hamano wrote: > Christian Couder writes: > >> On Mon, Aug 31, 2015 at 10:38 AM, Matthieu Moy >> wrote: >>> Christian Couder writes: >>> That's why instead of ignoring only the first line, it is better to ignore the first paragraph. --- >>>

Re: [PATCH v3] trailer: support multiline title

2015-08-31 Thread Junio C Hamano
Christian Couder writes: > We currently ignore the first line passed to `git interpret-trailers`, > when looking for the beginning of the trailers. > > Unfortunately this does not work well when a commit is created with a > line break in the title, using for example the following command: > > git

Re: [PATCH v3] trailer: support multiline title

2015-08-31 Thread Junio C Hamano
Christian Couder writes: > On Mon, Aug 31, 2015 at 10:38 AM, Matthieu Moy > wrote: >> Christian Couder writes: >> >>> That's why instead of ignoring only the first line, it is better to >>> ignore the first paragraph. >>> --- >> >> Lacks sign-off again. > > Ooops, sorry. Let me forge one just

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

2015-08-31 Thread Junio C Hamano
Eric Sunshine writes: > Thanks for working on this metoo > Stepping back a bit, is a for-each-foo()-style interface desirable? > This sort of interface imposes a good deal of complexity on callers, > demanding a callback function and callback data (cb_data), and is > generally (at least in

Re: [PATCH v14 04/13] ref-filter: implement an `align` atom

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 1:28 PM, Matthieu Moy wrote: > Eric Sunshine writes: >> On Mon, Aug 31, 2015 at 5:55 AM, Karthik Nayak wrote: >>> On Sun, Aug 30, 2015 at 3:10 PM, Eric Sunshine >>> wrote: On Sun, Aug 30, 2015 at 9:38 AM, Karthik Nayak wrote: > On Sun, Aug 30, 2015 at 8:

Re: Running interpret-trailers automatically on each commit?

2015-08-31 Thread Junio C Hamano
Matthieu Moy writes: > Jeremy Morton writes: > >> Yeah but it's kind of useless to me having it on each commit on a >> per-repo basis (and even then, only with hooks). > > Please, don't top-post on this list. > > Actually, it seems strange to me to activate it on a per-user basis. > Whether you

Re: Running interpret-trailers automatically on each commit?

2015-08-31 Thread Junio C Hamano
Matthieu Moy writes: > Jeremy Morton writes: > >> Yeah but it's kind of useless to me having it on each commit on a >> per-repo basis (and even then, only with hooks). > > Please, don't top-post on this list. > > Actually, it seems strange to me to activate it on a per-user basis. > Whether you

Re: [PATCH] git-p4: add "--path-encoding" option

2015-08-31 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Signed-off-by: Lars Schneider > --- > Documentation/git-p4.txt| 4 > git-p4.py | 6 ++ > t/t9821-git-p4-path-encoding.sh | 38 ++ > 3 files changed, 48 insert

Re: [PATCH v14 04/13] ref-filter: implement an `align` atom

2015-08-31 Thread Matthieu Moy
Eric Sunshine writes: > On Mon, Aug 31, 2015 at 5:55 AM, Karthik Nayak wrote: >> On Sun, Aug 30, 2015 at 3:10 PM, Eric Sunshine >> wrote: >>> On Sun, Aug 30, 2015 at 9:38 AM, Karthik Nayak >>> wrote: On Sun, Aug 30, 2015 at 8:57 AM, Eric Sunshine wrote: > On Sat, Aug 29, 2015

Re: [RFC/PATCH] date: allow any format to display local time

2015-08-31 Thread Junio C Hamano
John Keeping writes: > Make DATE_LOCAL a bit flag that may be combined with the other formats. > In order to keep date_mode_type as a true enumeration the possible > combinations are included explicitly (except "relative local time" which > is nonsensical). > > Signed-off-by: John Keeping > ---

Re: [PATCH v14 04/13] ref-filter: implement an `align` atom

2015-08-31 Thread Eric Sunshine
On Mon, Aug 31, 2015 at 5:55 AM, Karthik Nayak wrote: > On Sun, Aug 30, 2015 at 3:10 PM, Eric Sunshine > wrote: >> On Sun, Aug 30, 2015 at 9:38 AM, Karthik Nayak wrote: >>> On Sun, Aug 30, 2015 at 8:57 AM, Eric Sunshine >>> wrote: On Sat, Aug 29, 2015 at 10:12 AM, Karthik Nayak wr

Re: [PUB]What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> * ad/bisect-terms (2015-08-03) 4 commits >>> - bisect: allow setting any user-specified in 'git bisect start' >>> - bisect: add 'git bisect terms' to view the current terms >>> - bisect: add the terms old/new >>

Re: [PATCH] t7300: fix broken && chains

2015-08-31 Thread Junio C Hamano
Erik Elfström writes: > While we are here, remove some boilerplate by using test_commit. > > Signed-off-by: Erik Elfström > --- Many of the constructs we see here shows clearly that this is an ancient part of the codebase ;-), as we would be using the one parameter form of "git init" and more t

[PATCH] push: don't show Done with --quiet --porcelain

2015-08-31 Thread Josh Rabinowitz
Change so 'git push --porcelain --quiet' emits no text when there is no error. This makes the --quiet option here more consistent with other git commands. Signed-off-by: josh rabinowitz --- transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport.c b/transport.c

Re: [PATCH v2] log: diagnose empty HEAD more clearly

2015-08-31 Thread Junio C Hamano
Jeff King writes: > On Fri, Aug 28, 2015 at 02:11:01PM -0700, Junio C Hamano wrote: > >> * jk/log-missing-default-HEAD (2015-06-03) 1 commit >> - log: diagnose empty HEAD more clearly >> >> "git init empty && git -C empty log" said "bad default revision 'HEAD'", >> which was found to be a bit

Re: [PATCH] show-ref: place angle brackets around variables in usage string

2015-08-31 Thread Junio C Hamano
Junio C Hamano writes: >>> - N_("git show-ref --exclude-existing[=pattern] < ref-list"), >>> + N_("git show-ref --exclude-existing[=] < "), >> >> Should the '<' stdin redirection be shown? > > Hmm, that actually is an interesting thought,... Having said all that (i.e. I agree dropping "< $anythi

Re: [PATCH] show-ref: place angle brackets around variables in usage string

2015-08-31 Thread Junio C Hamano
"Philip Oakley" writes: > From: "Alex Henrie" >> Signed-off-by: Alex Henrie >> --- >> builtin/show-ref.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/builtin/show-ref.c b/builtin/show-ref.c >> index dfbc314..131ef28 100644 >> --- a/builtin/show-ref.c >> +++ b/built

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

2015-08-31 Thread Junio C Hamano
Duy Nguyen writes: > On Fri, Aug 28, 2015 at 12:07 AM, David Turner > wrote: >> 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

[PATCH] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt| 4 git-p4.py | 6 ++ t/t9821-git-p4-path-encoding.sh | 38 ++ 3 files changed, 48 insertions(+) create mode 100755 t/t9821-git-p4-path-e

[PATCH] git-p4: add "--path-encoding" option

2015-08-31 Thread larsxschneider
From: Lars Schneider Hi, I think I discovered a path encoding issue if you migrate P4 repositories that contain path names generated with Windows. I added a test case to prove my point. Character encoding is a complicated topic. Feedback is highly appreciated. Thanks, Lars Lars Schneider (1

Re: [PUB]What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> * ad/bisect-terms (2015-08-03) 4 commits >> - bisect: allow setting any user-specified in 'git bisect start' >> - bisect: add 'git bisect terms' to view the current terms >> - bisect: add the terms old/new >> - bisect: sanity check on terms

Re: Git's inconsistent command line options

2015-08-31 Thread Barry Warsaw
On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote: >I'm probably shot down for this. But could we go with a clean plate >and create a new command prefix (something like git-next, git2, or >gt...)? We could then redesign the entire UI without worrying about >backward compatibility. At some point we ca

Re: [PATCH] INSTALL: Add docs on how to use custom Python paths.

2015-08-31 Thread Junio C Hamano
Ehsan Akhgari writes: > Signed-off-by: Ehsan Akhgari > --- > INSTALL | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/INSTALL b/INSTALL > index ffb071e..5b7fe91 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -148,6 +148,11 @@ Issues of note: > supported by Perforce) is needed

Re: git Dockerfile for ppc64le

2015-08-31 Thread Johannes Schindelin
Hi, On 2015-08-25 06:37, Gawade P wrote: > I have built and tested the latest version on git on multiple > distributions including Ubuntu 15.04 on the ppc64le architecture. I > have run the complete test suite and verified that there are no test > failures. > > I have also written a dockerfile f

Re: What's cooking in git.git (Aug 2015, #05; Fri, 28)

2015-08-31 Thread Junio C Hamano
Christian Couder writes: >> * dt/refs-bisection (2015-08-28) 5 commits >> - bisect: make bisection refs per-worktree >> - refs: make refs/worktree/* per-worktree >> - SQUASH??? >> - path: optimize common dir checking >> - refs: clean up common_list >> >> Move the refs used during a "git bis

Re: [PATCH] INSTALL: Add docs on how to use custom Python paths.

2015-08-31 Thread Luke Diamand
On 31 August 2015 at 14:22, Ehsan Akhgari wrote: > Signed-off-by: Ehsan Akhgari > --- > INSTALL | 5 + > 1 file changed, 5 insertions(+) > > diff --git a/INSTALL b/INSTALL > index ffb071e..5b7fe91 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -148,6 +148,11 @@ Issues of note: > suppo

Re: Git crash on different versions, including current

2015-08-31 Thread Johannes Schindelin
Hi Christian, On 2015-08-29 10:41, Christian Soltenborn wrote: > today I ran into a git issue on Windows 7/64. My directory structure > looks like this, and I wondered why the content of a dir wouldn't get added. > > C:\Users\chris\git\GoogleTestExtension > -- .git > -- ConsoleApplication1 (new)

[PATCH] INSTALL: Add docs on how to use custom Python paths.

2015-08-31 Thread Ehsan Akhgari
Signed-off-by: Ehsan Akhgari --- INSTALL | 5 + 1 file changed, 5 insertions(+) diff --git a/INSTALL b/INSTALL index ffb071e..5b7fe91 100644 --- a/INSTALL +++ b/INSTALL @@ -148,6 +148,11 @@ Issues of note: supported by Perforce) is needed to use the git-p4 interface to Pe

[PATCH] git-quiltimport: add commandline option --series

2015-08-31 Thread Juerg Haefliger
The quilt series file doesn't have to be located in the same directory with the patches and can be named differently than 'series' as well. This patch adds a commandline option to allow for a non-standard series filename and location. Signed-off-by: Juerg Haefliger --- Documentation/git-quiltimp

Re: [PATCH v14 00/13] Port tag.c to use ref-filter.c

2015-08-31 Thread Karthik Nayak
On Mon, Aug 31, 2015 at 1:01 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> * We perform quoting on each layer of nested alignment. > > I do not understand why. > > For example, using the tip of karthik/exp on GitHub (on top of this > series, d91419b (ref-filter: adopt get_head_description(

Re: [PATCH v14 00/13] Port tag.c to use ref-filter.c

2015-08-31 Thread Karthik Nayak
On Mon, Aug 31, 2015 at 12:20 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> diff --git a/Documentation/git-for-each-ref.txt >> b/Documentation/git-for-each-ref.txt >> index 06d468e..1b48b95 100644 >> --- a/Documentation/git-for-each-ref.txt >> +++ b/Documentation/git-for-each-ref.txt >> @

Re: [PATCH v14 04/13] ref-filter: implement an `align` atom

2015-08-31 Thread Karthik Nayak
On Mon, Aug 31, 2015 at 2:00 PM, Matthieu Moy wrote: > Hi, > > Just a remark on the way iterations are going on with this series: I do > agree that each version gets better than the previous one, which is > good. However, I have the feeling that we're turning a simple and easy > to review series i

Re: [PATCH] setup: update the right file in multiple checkouts

2015-08-31 Thread Duy Nguyen
On Tue, Aug 25, 2015 at 11:38 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> This code is introduced in 23af91d (prune: strategies for linked >> checkouts - 2014-11-30), and it's supposed to implement this rule from >> that commit's message: >> >> - linked checkouts are supposed

Re: [PATCH v14 04/13] ref-filter: implement an `align` atom

2015-08-31 Thread Karthik Nayak
On Mon, Aug 31, 2015 at 3:44 PM, Karthik Nayak wrote: > On Mon, Aug 31, 2015 at 4:26 AM, Eric Sunshine > wrote: >> On Sun, Aug 30, 2015 at 1:27 PM, Junio C Hamano wrote: >>> Eric Sunshine writes: With the disclaimer that I wasn't following the quoting discussion closely: Is this cond

  1   2   >