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

2015-08-30 Thread Matthieu Moy
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 > @@ -149,6 +149,7 @@ Its first line is `contents:subject`, where s

Re: [PATCH v6 2/2] worktree: add 'list' command

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 3:10 PM, Michael Rappazzo wrote: > 'git worktree list' uses the for_each_worktree function to iterate, > and outputs the worktree dir. With the verbose option set, it also > shows the branch or revision currently checked out in that worktree. > > Signed-off-by: Michael Rap

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

2015-08-30 Thread Eric Sunshine
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... On Sun, Aug 30, 2015 at 3:10 PM, Michael Rappazzo wrote: > for_each_worktree iterates through each worktree and invokes a callback > function. The

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Junio C Hamano
Eric Sunshine writes: > I suppose a viable approach might be to test once outside the loop if > "date +%s" is supported and print the "(%d elapsed / %d estimated > remaining)" annotation within the loop if it is, else not. The test > might look something like this: > > echo $(date +%s) | grep -q

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

2015-08-30 Thread Karthik Nayak
On Sun, Aug 30, 2015 at 3:13 PM, Eric Sunshine wrote: > On Sat, Aug 29, 2015 at 10:12 AM, 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 t

[BUG] rebase modify/delete conflict prints wrong SHA-1

2015-08-30 Thread George Spelvin
I was rebasing my local kernel patches on top of v4.2 (using Debian git_1:2.5.1-1_amd64), and ran into the following when one of the files I modified got renamed in mainline: Applying: drivers/ntb/ntb_hw.c: Use prandom_u32_max() Using index info to reconstruct a base tree... A drivers/ntb/nt

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

2015-08-30 Thread Eric Sunshine
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 condition going to be sufficient for all cases, such >> as an %(if:) atom? That is, if you have: >> >> %(if:notempty)%(bloop

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

2015-08-30 Thread Eric Sunshine
On Sat, Aug 29, 2015 at 10:12 AM, 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 strbuf. > > Implement %

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

2015-08-30 Thread Eric Sunshine
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 >> wrote: >>> +static void append_atom(struct atom_value *v, struct ref_formatting_state >>> *state) >>> +{ >>> + /* >>> +

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

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 10:57 AM, Karthik Nayak wrote: > On Sun, Aug 30, 2015 at 8:57 AM, Eric Sunshine > wrote: >>> +struct align { >>> + align_type position; >>> + unsigned int width; >>> }; >>> >>> #define REF_FORMATTING_STATE_INIT { 0, NULL } >>> @@ -69,6 +79,8 @@ struct ref_f

Re: Add passed and estimated seconds to the filter-branch on demand via --progress-eta flag

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 7:45 AM, Gabor Bernat wrote: > I've submitted this first to this list as a feature request, however > in the meantime with the help of Jeff King , Junio C > Hamano , Eric Sunshine > and Mikael Magnusson came up with solution, so now > I submit it as a patch. Here follows

Git configure/make does not honor ARFLAGS

2015-08-30 Thread Jeffrey Walton
I'm working on an old OS X machine. I needed to perform: AR=libtool ARFLAGS="-static -o" ... make configure ./configure ... make However, it appears the Makefile does not respect ARFLAGS: $ grep -IR '$(AR)' * Makefile:$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ Makefile:

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 03:40:20PM -0400, Eric Sunshine wrote: > I suppose a viable approach might be to test once outside the loop if > "date +%s" is supported and print the "(%d elapsed / %d estimated > remaining)" annotation within the loop if it is, else not. The test > might look something lik

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Eric Sunshine
(please don't top-post on this list) On Sun, Aug 30, 2015 at 12:58 PM, Gabor Bernat wrote: > I would argue against the every n commit check, or at least making it > configurable, as in my case the speed is something between 0.01 and > 1.5 seconds per commit. Checking it every n commit would make

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Mikael Magnusson
On Sun, Aug 30, 2015 at 6:58 PM, Gabor Bernat wrote: > I would argue against the every n commit check, or at least making it > configurable, as in my case the speed is something between 0.01 and > 1.5 seconds per commit. Checking it every n commit would make it I > feel quite slow to adapt. But it

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 12:52 PM, Junio C Hamano wrote: >>> http://stackoverflow.com/questions/2445198/get-seconds-since-epoch-in-any-posix-compliant-shell >>> Found this, >>> >>> awk 'BEGIN{srand();print srand()}' >>> >>> srand() in awk returns the previous seed value, and calling it without >>>

[PATCH v3] trailer: support multiline title

2015-08-30 Thread Christian Couder
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 commit -m 'place of code: change we ma

[PATCH v6 2/2] worktree: add 'list' command

2015-08-30 Thread Michael Rappazzo
'git worktree list' uses the for_each_worktree function to iterate, and outputs the worktree dir. With the verbose option set, it also shows the branch or revision currently checked out in that worktree. Signed-off-by: Michael Rappazzo --- Documentation/git-worktree.txt | 10 - builtin/wor

[PATCH v6 0/2] worktree: for-each function and list command

2015-08-30 Thread Michael Rappazzo
Changes since v5: - used already existing functions instead of reimplementing: - resolve_ref_unsafe - find_unique_abbrev - shorten_unambiguous_ref - added more tests for 'worktree list' Michael Rappazzo (2): worktree: add 'for_each_worktree' function worktree: add 'list' comma

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

2015-08-30 Thread Michael Rappazzo
for_each_worktree iterates through each worktree and invokes a callback function. The main worktree (if not bare) is always encountered first, followed by worktrees created by `git worktree add`. If the callback function returns a non-zero value, iteration stops, and the callback's return value i

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

2015-08-30 Thread Junio C Hamano
Eric Sunshine writes: > With the disclaimer that I wasn't following the quoting discussion > closely: Is this condition going to be sufficient for all cases, such > as an %(if:) atom? That is, if you have: > > %(if:notempty)%(bloop)%(then) --option=%(bloop)%(end) > > isn't the intention that,

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

2015-08-30 Thread Karthik Nayak
On Sun, Aug 30, 2015 at 10:39 PM, Eric Sunshine wrote: > > I meant "mutually exclusive" in the sense of only one or the other of > 'align' and 'contents' ever being used within a single 'atom_value' > instance. (I wasn't referring to the user experience.) Sorry for the confusion, we're on the sam

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

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 1:02 PM, Karthik Nayak wrote: > On Sun, Aug 30, 2015 at 1:23 PM, Eric Sunshine > wrote: >> On Sat, Aug 29, 2015 at 10:12 AM, Karthik Nayak >> wrote: >>> struct atom_value { >>> const char *s; >>> struct align *align; >>> + struct contents *content

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

2015-08-30 Thread Karthik Nayak
On Sun, Aug 30, 2015 at 1:23 PM, Eric Sunshine wrote: > On Sat, Aug 29, 2015 at 10:12 AM, 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 t

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Gabor Bernat
I would argue against the every n commit check, or at least making it configurable, as in my case the speed is something between 0.01 and 1.5 seconds per commit. Checking it every n commit would make it I feel quite slow to adapt. But it's debatable. On 8/30/15, Junio C Hamano wrote: > Eric Sunsh

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Junio C Hamano
Eric Sunshine writes: >>> Most portable likely would be Perl, however, that's probably too >>> heavyweight inside a loop like this, even if called only once each N >>> iterations. I think that is true. Now, when it is too heavy to spawn perl, would it be light enough to spawn awk, I have to won

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

2015-08-30 Thread Luke Diamand
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 stuff into git-p4.py (>3000 LOC already). > What do you think about splitting git-p4 into multiple files

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

2015-08-30 Thread Karthik Nayak
On Sun, Aug 30, 2015 at 8:57 AM, Eric Sunshine wrote: >> Add documentation and tests for the same. >> >> Signed-off-by: Karthik Nayak >> --- >> diff --git a/ref-filter.c b/ref-filter.c >> index 432cea0..21c8b5f 100644 >> --- a/ref-filter.c >> +++ b/ref-filter.c >> @@ -53,6 +54,13 @@ static struct

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

2015-08-30 Thread John Keeping
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 --- I primarily want this to make life e

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

2015-08-30 Thread Karthik Nayak
On Sun, Aug 30, 2015 at 8:57 AM, Eric Sunshine wrote: > On Sat, Aug 29, 2015 at 10:12 AM, Karthik Nayak wrote: >> Implement an `align` atom which left-, middle-, or right-aligns the >> content between %(align:..) and %(end). >> >> It is followed by `:,`, where the `` is >> either left, right or m

Add passed and estimated seconds to the filter-branch on demand via --progress-eta flag

2015-08-30 Thread Gabor Bernat
Hello, I've submitted this first to this list as a feature request, however in the meantime with the help of Jeff King , Junio C Hamano , Eric Sunshine and Mikael Magnusson came up with solution, so now I submit it as a patch. Here follows a patch, I really hope I got right the format: >From 62

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

2015-08-30 Thread Lars Schneider
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 stuff into git-p4.py (>3000 LOC already). What do you think about splitting git-p4 into multiple files? Regarding Python 3: Would you drop Python 2 support or

[PATCH] t7300: fix broken && chains

2015-08-30 Thread Erik Elfström
While we are here, remove some boilerplate by using test_commit. Signed-off-by: Erik Elfström --- t/t7300-clean.sh | 16 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 27557d6..86ceb38 100755 --- a/t/t7300-clean.sh +++ b/

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

2015-08-30 Thread Luke Diamand
Comments below. > > diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt > index 82aa5d6..a188840 100644 > --- a/Documentation/git-p4.txt > +++ b/Documentation/git-p4.txt > @@ -252,6 +252,18 @@ Git repository: > Use a client spec to find the list of interesting files in p4. >

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

2015-08-30 Thread Luke Diamand
On 28 August 2015 at 13:24, wrote: > From: Lars Schneider > > I am migrating huge Perforce repositories including history to Git. Some of > them contain large files that would blow up the resulting Git repositories. > This patch adds an option to store these files in Git LFS [1] on git-p4 clon

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 4:04 AM, Mikael Magnusson wrote: > On Sun, Aug 30, 2015 at 5:15 AM, Eric Sunshine > wrote: >> On Sat, Aug 29, 2015 at 11:00 PM, Gabor Bernat wrote: >>> Reading after it, I think the most close we can get with this is, awk >>> 'BEGIN { print strftime("%c", 1271603087); };

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Mikael Magnusson
On Sun, Aug 30, 2015 at 10:11 AM, Gabor Bernat wrote: > this can work instead of the data command for getting the time > elapsed, however for getting the actual date of a timestamp is not > possible generally; so I think I will just remove that part. > Bernát GÁBOR > > > On Sun, Aug 30, 2015 at 10

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Gabor Bernat
this can work instead of the data command for getting the time elapsed, however for getting the actual date of a timestamp is not possible generally; so I think I will just remove that part. Bernát GÁBOR On Sun, Aug 30, 2015 at 10:04 AM, Mikael Magnusson wrote: > On Sun, Aug 30, 2015 at 5:15 AM,

Re: [FEATURE REQUEST] Filter-branch extend progress with a simple estimated time remaning

2015-08-30 Thread Mikael Magnusson
On Sun, Aug 30, 2015 at 5:15 AM, Eric Sunshine wrote: > (Please don't top-post on this list.) > > On Sat, Aug 29, 2015 at 11:00 PM, Gabor Bernat wrote: >> Reading after it, I think the most close we can get with this is, awk >> 'BEGIN { print strftime("%c", 1271603087); }; and just ignore setting

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

2015-08-30 Thread Eric Sunshine
On Sat, Aug 29, 2015 at 10:12 AM, 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 strbuf. > > Implement %

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

2015-08-30 Thread Eric Sunshine
On Sun, Aug 30, 2015 at 2:51 AM, Karthik Nayak wrote: > On Sun, Aug 30, 2015 at 9:00 AM, Eric Sunshine > wrote: >> On Sat, Aug 29, 2015 at 10:12 AM, Karthik Nayak >> wrote: >>> +int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, >>> unsigned int broken) >> >> Booleans