[PATCH 9/9] Use timer_settime for new platforms

2014-08-29 Thread Jacob Keller
use setitimer on its own now, as the fallback implementation of timer_settime assumes that it is the sole user of ITIMER_REAL, and timer_delete will reset the ITIMER_REAL. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- builtin

[PATCH 6/9] autoconf: Check for struct sigevent

2014-08-29 Thread Jacob Keller
From: Jonas 'Sortie' Termansen sor...@maxsi.org This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without struct sigevent if they only rely on config.mak.uname. They will need to set NO_STRUCT_SIGEVENT manually.

[PATCH 7/9] autoconf: Check for struct itimerspec

2014-08-29 Thread Jacob Keller
manually. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Makefile | 5 + config.mak.uname | 3 +++ configure.ac | 7 +++ git-compat-util.h | 7 +++ 4 files changed, 22 insertions(+) diff --git a/Makefile b

[PATCH 2/9] autoconf: Check for struct itimerval

2014-08-29 Thread Jacob Keller
From: Jonas 'Sortie' Termansen sor...@maxsi.org The makefile has provisions for this case, so let's detect it in the configure script as well. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- configure.ac | 8 1 file

[PATCH 3/9] autoconf: Check for setitimer

2014-08-29 Thread Jacob Keller
From: Jonas 'Sortie' Termansen sor...@maxsi.org The makefile has provisions for this case, so let's detect it in the configure script as well. Signed-off-by: Jonas 'Sortie' Termansen sor...@maxsi.org --- configure.ac | 6 ++ 1 file changed, 6 insertions(+) diff --git a/configure.ac

[PATCH 4/9] autoconf: Check for timer_t

2014-08-29 Thread Jacob Keller
-by: Jonas 'Sortie' Termansen sor...@maxsi.org Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Makefile | 5 + config.mak.uname | 2 ++ configure.ac | 8 git-compat-util.h | 4 4 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 9f984a9e5561

[PATCH 1/9] git-compat-util.h: Add missing semicolon after struct itimerval

2014-08-29 Thread Jacob Keller
From: Jonas 'Sortie' Termansen sor...@maxsi.org This hasn't been a problem in practice as almost all systems have the setitimer() API (or it is provided by git in the case of mingw). This code wasn't used in any default circumstances, as the build system never sets NO_STRUCT_ITIMERVAL - this

[PATCH 8/9] autoconf: Check for timer_settime

2014-08-29 Thread Jacob Keller
...@maxsi.org Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Makefile | 21 + config.mak.uname | 3 +++ configure.ac | 8 git-compat-util.h | 20 +++- 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile

[PATCH 5/9] autoconf: Check for struct timespec

2014-08-29 Thread Jacob Keller
From: Jonas 'Sortie' Termansen sor...@maxsi.org This type will be used in a following commit. This type was not previously used by git. This can cause trouble for people on systems without struct timespec if they only rely on config.mak.uname. They will need to set NO_STRUCT_TIMESPEC manually.

[PATCH] tag: support configuring --sort via .gitconfig

2014-07-09 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Nguyễn Thái Ngọc Duy pclo...@gmail.com Cc: Junio C Hamano gits...@pobox.com Signed-off-by: Jacob Keller jacob.e.kel...@intel.com

[PATCH] makefile: add ability to run specific test files

2014-07-09 Thread Jacob Keller
. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Makefile | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 07ea1058379a..86bdc4ed1ee9 100644 --- a/Makefile +++ b/Makefile @@ -2262,13 +2262,18 @@ export TEST_NO_MALLOC_CHECK ### Testing rules

[PATCH v2] tag: support configuring --sort via .gitconfig

2014-07-09 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Repost with changes suggested by Peff. These include fixing

[PATCH v4] linuxptp: add phc_ctl program to help debug PHC devices

2014-07-10 Thread Jacob Keller
, in order to reduce duplication. Hopefully this is of some use to everyone. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- -v4 * fix manpage warnings and incorrect display * add phc_ctl to .gitignore .gitignore | 1 + makefile | 4 +- phc_ctl.8 | 108 phc_ctl.c | 561

[PATCH] gitignore: add .version as this is generated during a make

2014-07-10 Thread Jacob Keller
Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e0710ad5b294..098dcdfe1ea7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /*.d /*.o +/.version /hwstamp_ctl /phc2sys /pmc

[PATCH 1/2] tag: use skip_prefix instead of magic numbers

2014-07-10 Thread Jacob Keller
Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Authored-by: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- builtin/tag.c | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git

[PATCH 2/2 v4] tag: support configuring --sort via .gitconfig

2014-07-10 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- - v4 * base on top of suggested change by Jeff King to use

[PATCH 2/3] tag: fix --sort tests to use cat-\EOF format

2014-07-11 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Jacob Keller
Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Authored-by: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- builtin/tag.c | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git

[PATCH 2/3] tag: fix --sort tests to use cat-\EOF format

2014-07-11 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Updated based on Junio's suggestions, as well as making sure

[PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Jacob Keller
From: Jeff King p...@peff.net Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Fixed authorship. I don't expect this version to be taken

[PATCH 2/3] tag: fix --sort tests to use cat-\EOF format

2014-07-11 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Jacob Keller
From: Jeff King p...@peff.net Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- builtin/tag.c | 14 -- 1 file changed, 4 insertions

[PATCH 3/3 v7] tag: support configuring --sort via .gitconfig

2014-07-11 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Updated warning texts based on Jeff's feedback. Also added

[PATCH 2/3] tag: fix --sort tests to use cat-\EOF format

2014-07-11 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH 1/3] tag: use skip_prefix instead of magic numbers

2014-07-11 Thread Jacob Keller
From: Jeff King p...@peff.net Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Signed-off-by: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Fixed issue with patch in that we dropped the reset

[PATCH v8 0/4] tag: configure default tag sort via .gitconfig

2014-07-15 Thread Jacob Keller
is included as well. Jacob Keller (4): usage: make error functions a stack tag: fix --sort tests to use cat-\EOF format tag: update parsing to be more precise regarding errors tag: support configuring --sort via .gitconfig Documentation/config.txt | 5 +++ Documentation/git-tag.txt | 5

[PATCH v8 1/4] usage: make error functions a stack

2014-07-15 Thread Jacob Keller
Let error routine be a stack of error functions so that callers can temporarily override the error_routine and then pop their modification off the stack. This enables customizing error for a small code segment. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- This is a modification

[PATCH v8 4/4] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Jacob Keller
...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Documentation/config.txt | 5 ++ Documentation/git-tag.txt | 5 +- builtin/tag.c | 124 -- t/t7004-tag.sh| 36 ++ 4 files changed, 120 insertions(+), 50

[PATCH v8 2/4] tag: fix --sort tests to use cat-\EOF format

2014-07-15 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH v8 3/4] tag: update parsing to be more precise regarding errors

2014-07-15 Thread Jacob Keller
Update the parsing of sort string specifications so that it is able to properly detect errors in the function type and allowed atoms. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- This function should replace the one I think is already on one of the branches

[PATCH v9 4/4] tag: support configuring --sort via .gitconfig

2014-07-15 Thread Jacob Keller
...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Documentation/config.txt | 5 ++ Documentation/git-tag.txt | 5 +- builtin/tag.c | 124 -- t/t7004-tag.sh| 36 ++ 4 files changed, 120 insertions(+), 50

[PATCH v9 3/4] tag: update parsing to be more precise regarding errors

2014-07-15 Thread Jacob Keller
Update the parsing of sort string specifications so that it is able to properly detect errors in the function type and allowed atoms. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- builtin/tag.c | 55 +-- 1

[PATCH v9 2/4] tag: fix --sort tests to use cat-\EOF format

2014-07-15 Thread Jacob Keller
The --sort tests should use the better format for expect to maintain indenting and ensure that no substitution is occurring. This makes parsing and understanding the tests a bit easier. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- t/t7004-tag.sh | 40

[PATCH v9 1/4] usage: make error functions a stack

2014-07-15 Thread Jacob Keller
Rename set_error_routine to be push_error_routine, and add a new pop_error_routine. This allows temporary modifications of the error routine over a small block of code. Signed-off-by: Jacob Keller jacob.e.kel...@intel.com --- Renamed set_error_routine to push_error_routine in order to match

[PATCH v10] tag: support configuring --sort via .gitconfig

2014-07-16 Thread Jacob Keller
Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com Signed-off-by: Junio C Hamano gits...@pobox.com --- Based

refspecs with '*' as part of pattern

2015-07-06 Thread Jacob Keller
Hi, I've been looking at the refspecs for git fetch, and noticed that globs are partially supported. I wanted to use something like: refs/tags/some-prefix-*:refs/tags/some-prefix-* as a refspec, so that I can fetch only tags which have a specific prefix. I know that I could use namespaces to

Re: refspecs with '*' as part of pattern

2015-07-06 Thread Jacob Keller
On Mon, Jul 6, 2015 at 4:01 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.kel...@gmail.com writes: What is the reason for not allowing slightly more arbitrary expressions? Obviously no more than one *... I cannot seem to be able to find related discussions around that patch

Re: refspecs with '*' as part of pattern

2015-07-06 Thread Jacob Keller
On Mon, Jul 6, 2015 at 7:20 PM, Daniel Barkalow barka...@iabervon.iabervon.org wrote: On Mon, 6 Jul 2015, Junio C Hamano wrote: Jacob Keller jacob.kel...@gmail.com writes: I've been looking at the refspecs for git fetch, and noticed that globs are partially supported. I wanted to use

Re: Whether Git supports directory level access or not?

2015-07-07 Thread Jacob Keller
Hi On Mon, Jul 6, 2015 at 11:40 PM, saur...@stockal.com wrote: Hi, Please let me know whether Git supports directory level access or not. For example :- Consider the structure with one repository consisting of sub directories for each product. main_repo: dir1 dir dir2 dir

Re: refspecs with '*' as part of pattern

2015-07-07 Thread Jacob Keller
On Mon, Jul 6, 2015 at 7:33 PM, Jacob Keller jacob.kel...@gmail.com wrote: On Mon, Jul 6, 2015 at 7:20 PM, Daniel Barkalow barka...@iabervon.iabervon.org wrote: On Mon, 6 Jul 2015, Junio C Hamano wrote: Jacob Keller jacob.kel...@gmail.com writes: I've been looking at the refspecs for git

Re: [RFC/PATCH 04/11] ref-filter: add 'ifexists' atom

2015-08-01 Thread Jacob Keller
On Fri, Jul 31, 2015 at 11:46 PM, Karthik Nayak karthik@gmail.com wrote: On Thu, Jul 30, 2015 at 2:51 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: Couldn't think of a better replacer, any

Re: [RFC/PATCH 07/11] branch: move 'current' check down to the presentation layer

2015-08-01 Thread Jacob Keller
On Fri, Jul 31, 2015 at 11:48 PM, Karthik Nayak karthik@gmail.com wrote: On Thu, Jul 30, 2015 at 2:57 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Karthik Nayak karthik@gmail.com writes: What I was thinking of was something like this : struct strbuf format = STRBUF_INIT;

[PATCH v4 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-11 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2

[PATCH v4 2/4] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-11 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- t/t3310-notes-merge-manual-resolve.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3310

[PATCH v4 0/4] add notes strategy configuration options

2015-08-11 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This series of patches implements notes.merge and notes.ref.merge options for configuring notes merge strategy such that user may avoid typing -s. It is (probably) most useful if the user wishes to always enforce cat_sort_uniq strategy. This series now

[PATCH v4 3/4] notes: add notes.merge option to select default strategy

2015-08-11 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about notes.merge to select a general strategy for all notes merges. This enables a user to always get expected merge strategy such as cat_sort_uniq without having to pass the -s option manually. Signed-off-by: Jacob Keller jacob.kel

[PATCH v4 4/4] notes: teach git-notes about notes.ref.merge option

2015-08-11 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new option notes.ref.merge option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want cat_sort_uniq

Re: [PATCH v4 4/4] notes: teach git-notes about notes.ref.merge option

2015-08-12 Thread Jacob Keller
On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller jacob.kel...@gmail.com wrote: Oh interesting. I did a test. If you provide a fully qualified ref not inside refs/notes, then it assumes you meant refs/notes/refs/foo/y rather than refs/foo/y I need to do some more digging on this to determine

Re: [PATCH v4 4/4] notes: teach git-notes about notes.ref.merge option

2015-08-12 Thread Jacob Keller
On Wed, Aug 12, 2015 at 2:57 PM, Jacob Keller jacob.kel...@gmail.com wrote: On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland jo...@herland.net wrote: If we don't already refuse to merge into a ref outside refs/notes, then I would consider that a bug to be fixed, and not some corner use case

Re: [PATCH v4 4/4] notes: teach git-notes about notes.ref.merge option

2015-08-12 Thread Jacob Keller
On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland jo...@herland.net wrote: If we don't already refuse to merge into a ref outside refs/notes, then I would consider that a bug to be fixed, and not some corner use case that we must preserve for all future. After all, we do already have a test in

Re: [PATCH v4 4/4] notes: teach git-notes about notes.ref.merge option

2015-08-12 Thread Jacob Keller
On Wed, Aug 12, 2015 at 3:41 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.kel...@gmail.com writes: I spoke to soon. We have an init_notes_check function which shows that it does refuse to merge outside of refs/notes/* It prevents all notes operations outside of refs/notes

Re: [PATCH v11 12/13] tag.c: implement '--format' option

2015-08-17 Thread Jacob Keller
On Mon, Aug 17, 2015 at 12:14 PM, Karthik Nayak karthik@gmail.com wrote: On Tue, Aug 18, 2015 at 12:34 AM, Junio C Hamano gits...@pobox.com wrote: Karthik Nayak karthik@gmail.com writes: From: Karthik Nayak karthik@gmail.com Implement the '--format' option provided by

Re: [PATCH v9 3/6] note: extract parse_notes_merge_strategy to notes-utils

2015-08-17 Thread Jacob Keller
On Mon, Aug 17, 2015 at 3:38 PM, Junio C Hamano gits...@pobox.com wrote: Jacob Keller jacob.e.kel...@intel.com writes: From: Jacob Keller jacob.kel...@gmail.com Combining rewrite and notes-merge functionality has been left as an exercise for a future contributor. This comment is probably

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

2015-08-16 Thread Jacob Keller
On Sat, Aug 15, 2015 at 11:00 AM, Karthik Nayak karthik@gmail.com wrote: align:: - Implement an `align` atom which left-, middle-, or - right-aligns the content between %(align:..) and - %(end). Followed by `:position,width`, where the + left-, middle-, or

Re: Moved code detection with `git apply` a la `git blame -C -C`

2015-08-19 Thread Jacob Keller
Maybe something along the lines of a git-subtree merge. I am not sure how to do that exactly, and I am not sure that it would be worth the trouble to setup for a small case... On Tue, Aug 18, 2015 at 1:11 PM, Anish Tondwalkar tondwal...@virginia.edu wrote: I stashed some changes, then refactored

Re: [PATCH v8 4/8] notes: allow use of the rewrite terminology for merge strategies

2015-08-17 Thread Jacob Keller
Hi, On Mon, Aug 17, 2015 at 5:54 AM, Johan Herland jo...@herland.net wrote: On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com wrote: From: Jacob Keller jacob.kel...@gmail.com notes-merge.c already re-uses the same functions for the automatic merge strategies used

Re: [PATCH v8 8/8] notes: teach git-notes about notes.ref.mergeStrategy option

2015-08-17 Thread Jacob Keller
Hi, On Mon, Aug 17, 2015 at 6:21 AM, Johan Herland jo...@herland.net wrote: Allow me to suggest a different wording, somewhat inspired by the branch.name.* documentation... On Mon, Aug 17, 2015 at 10:46 AM, Jacob Keller jacob.e.kel...@intel.com wrote: From: Jacob Keller jacob.kel

[PATCH v9 1/6] notes: document cat_sort_uniq rewriteMode

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 5

[PATCH v9 0/6] implement notes.mergeStrategy

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This series implements mergeStrategy configuration options which take the same value as --strategy. This series does not change the allowed refs to merge from or to. There is a known limitation that you cannot merge from refs outside of refs/notes

[PATCH v9 5/6] notes: add notes.mergeStrategy option to select default strategy

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about notes.mergeStrategy to select a general strategy for all notes merges. This enables a user to always get expected merge strategy such as cat_sort_uniq without having to pass the -s option manually. Signed-off-by: Jacob Keller

[PATCH v9 6/6] notes: teach git-notes about notes.name.mergeStrategy option

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach notes about a new notes.name.mergeStrategy option for configuring the notes merge strategy when merging into refs/notes/name. This option allows for the selection of merge strategy for particular notes refs, rather than all notes ref merges, as user

[PATCH v9 3/6] note: extract parse_notes_merge_strategy to notes-utils

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Combining rewrite and notes-merge functionality has been left as an exercise for a future contributor. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- builtin/notes.c | 12 +--- notes-utils.c | 18 ++ notes-utils.h

[PATCH v9 2/6] notes: extract enum notes_merge_strategy to notes-utils.h

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com A future patch will extract parsing of the --strategy string into a helper function in notes.c and will require the enumeration definition. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- notes-merge.h | 10 +++--- notes-utils.h | 8

[PATCH v9 4/6] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- t/t3310-notes-merge-manual-resolve.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3310

[PATCH v8 2/8] notes: extract enum notes_merge_strategy to notes-utils.h

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com A future patch will extract parsing of the --strategy string into a helper function in notes.c and will require the enumeration definition. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- notes-merge.h | 10 +++--- notes-utils.h | 8

[PATCH v8 4/8] notes: allow use of the rewrite terminology for merge strategies

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com notes-merge.c already re-uses the same functions for the automatic merge strategies used by the rewrite functionality. Teach the -s/--strategy option how to interpret the equivalent rewrite terminology for consistency. Add tests for the new synonyms

[PATCH v8 7/8] notes: add notes.mergeStrategy option to select default strategy

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about notes.mergeStrategy to select a general strategy for all notes merges. This enables a user to always get expected merge strategy such as cat_sort_uniq without having to pass the -s option manually. Signed-off-by: Jacob Keller

[PATCH v8 8/8] notes: teach git-notes about notes.ref.mergeStrategy option

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new option notes.ref.mergeStrategy option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want

[PATCH v8 6/8] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- t/t3310-notes-merge-manual-resolve.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3310

[PATCH v8 3/8] note: extract parse_notes_merge_strategy to notes-utils

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Allow future code to re-use the parsing functionality. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- builtin/notes.c | 12 +--- notes-utils.c | 18 ++ notes-utils.h | 1 + 3 files changed, 20 insertions(+), 11

[PATCH v8 0/8] implement notes.mergeStrategy option

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com - Changes since v7 - * add patches to make rewrite and merge take same options * camel case mergeStrategy * move init_notes_check above reading git-config in merge() This is necessary as it ensures refs are inside refs/notes/* It should be noted

[PATCH v8 5/8] notes: implement parse_combine_rewrite_fn using parse_notes_merge_strategy

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach the rewrite combine notes to use the same names as git-notes merge. This will support all current names plus a few new synonyms. Update documentation to point to NOTES MERGE STRATEGIES to explain the various rewrite options available. Implementing

[PATCH v8 1/8] notes: document cat_sort_uniq rewriteMode

2015-08-17 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 5

Re: [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs

2015-07-28 Thread Jacob Keller
On Tue, Jul 28, 2015 at 12:11 AM, Karthik Nayak karthik@gmail.com wrote: Make 'branch.c' use 'ref-filter' APIs for iterating through refs sorting. This removes most of the code used in 'branch.c' replacing it with calls to the 'ref-filter' library. Make 'tag.c' use the 'filter_refs()'

Re: [RFC/PATCH 04/11] ref-filter: add 'ifexists' atom

2015-07-28 Thread Jacob Keller
On Mon, Jul 27, 2015 at 11:56 PM, Karthik Nayak karthik@gmail.com wrote: The 'ifexists' atom allows us to print a required format if the preceeding atom has a value. If the preceeding atom has no value then Don't you mean following atom here? since you do document it as the next atom below

Re: [RFC/PATCH 11/11] branch: add '--points-at' option

2015-07-28 Thread Jacob Keller
On Tue, Jul 28, 2015 at 12:11 AM, Karthik Nayak karthik@gmail.com wrote: Add the '--points-at' option provided by 'ref-filter'. The option lets the user to list only branches which points at the given object. Add documentation and tests for the same. Mentored-by: Christian Couder

Re: builtin/tag.c issue with sort option

2015-07-28 Thread Jacob Keller
On Tue, Jul 28, 2015 at 3:27 PM, Jacob Keller jacob.kel...@gmail.com wrote: When passing -n on the command line, if you have configured sort manually, you get an error as it thinks you passed --sort and -n. It should automatically disable tag_sort if it wasn't passed from the command line

builtin/tag.c issue with sort option

2015-07-28 Thread Jacob Keller
When passing -n on the command line, if you have configured sort manually, you get an error as it thinks you passed --sort and -n. It should automatically disable tag_sort if it wasn't passed from the command line, as you probably know what you are doing when passing -n I'm attempting to work up

Re: [RFC/PATCH 07/11] branch: move 'current' check down to the presentation layer

2015-07-28 Thread Jacob Keller
On Tue, Jul 28, 2015 at 1:12 PM, Karthik Nayak karthik@gmail.com wrote: On Tue, Jul 28, 2015 at 6:39 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Karthik Nayak karthik@gmail.com writes: We check if given ref is the current branch in print_ref_list(). Move this check to

Re: [PATCH v3 2/6] notes: replace pseudorefs with real refs

2015-07-28 Thread Jacob Keller
On Tue, Jul 28, 2015 at 5:56 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Johan Herland jo...@herland.net writes: Here is where we start to differ. I would say that starting a notes merge is completely unrelated to your worktree. Consider this: It sounds like what a notes merge really

Re: [PATCH] git-am: flag suspiciously old or futuristic commits

2015-07-29 Thread Jacob Keller
On Wed, Jul 29, 2015 at 3:20 PM, Stefan Beller sbel...@google.com wrote: On Wed, Jul 29, 2015 at 3:01 PM, Paul Gortmaker paul.gortma...@windriver.com wrote: The linux kernel repository has some commits in it with dates from the year 1970 and also 2030 (and possibly others). We probably

Re: [RFC/PATCH 02/11] ref-filter: add 'colornext' atom

2015-07-29 Thread Jacob Keller
On Wed, Jul 29, 2015 at 2:30 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: Also, please explain here and in the commit message why this highly specialized colorizer ('colornext'), is needed even though a more general purpose one ('color')

Re: [PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-08-02 Thread Jacob Keller
On Sun, Aug 2, 2015 at 1:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Don't worry too much about it. Consider it something to keep in mind for future patches. I reviewed the change and it seemed okay. I mentioned it because one of the goals of patch submission, in addition to making an

Re: [PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-08-01 Thread Jacob Keller
On Sat, Aug 1, 2015 at 7:46 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Jul 31, 2015 at 7:12 PM, Jacob Keller jacob.e.kel...@intel.com wrote: Teach git-notes about a new configuration option notes.merge for selecting the default notes merge strategy. Document the option

Re: [PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-08-02 Thread Jacob Keller
On Sat, Aug 1, 2015 at 7:46 PM, Eric Sunshine sunsh...@sunshineco.com wrote: If conflicts arise and a strategy for automatically resolving -conflicting notes (see the -s/--strategy option) is not given, -the manual resolver is used. This resolver checks out the -conflicting notes in a special

[PATCH v3 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com Cc: Johan Herland jo...@herland.net Cc: Michael Haggerty mhag...@alum.mit.edu Cc

[PATCH v3 3/4] notes: add notes.merge option to select default strategy

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about a new configuration option notes.merge for selecting the default notes merge strategy. Document the option in config.txt and git-notes.txt Add tests for use of the configuration option. Include a test to ensure that --strategy

[PATCH v3 2/4] notes: add tests for --commit/--abort/--strategy exclusivity

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new tests to ensure that --commit, --abort, and --strategy are mutually exclusive. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- t/t3310-notes-merge-manual-resolve.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3310

[PATCH RFC 4/4] notes: add per-ref configuration of merge strategy

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about a new configuration option notes.localref.merge which selects the merge strategy for a particular ref. This allows selection of merge strategy different for each note reference, in addition to the default strategy for all references

[PATCH v3 0/4] notes: add support for notes.merge option

2015-08-02 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This series incorporates the feedback from both Johan and Eric. In addition, I included an RFC implementing suggestion from Johan regarding per-ref merge strategies. I split the tests for --merge/--commit/--strategy out into their own patch to help

[PATCH 2/2] notes: add notes.merge option to select default strategy

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about a new configuration option notes.merge for selecting the default notes merge strategy. Document the option in config.txt and git-notes.txt Add tests for the configuration option. Ensure that command line --strategy option overrides

[PATCH 0/2] add notes.merge configuration variable

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This small series is a precursor to some thoughts I have for enabling easier notes collaboration. First, make it so that users can configure the default notes merge strategy. Mostly useful if you always want to use cat_sort_uniq. I also found

[PATCH 1/2] notes: document cat_sort_uniq rewriteMode

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2

[PATCH v2 0/2] notes: add notes.merge strategy option

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com This series adds a default merge strategy option for git-notes, so that the user does not have to type -s every time. It is overridden by the -s option. I also added some tests to ensure that the --abort --commit and -s options must be independent

[PATCH v2 1/2] notes: document cat_sort_uniq rewriteMode

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach documentation about the cat_sort_uniq rewriteMode that got added at the same time as the equivalent merge strategy. Signed-off-by: Jacob Keller jacob.kel...@gmail.com Cc: Johan Herland jo...@herland.net Cc: Michael Haggerty mhag...@alum.mit.edu Cc

[PATCH v2 2/2] notes: add notes.merge option to select default strategy

2015-07-31 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about a new configuration option notes.merge for selecting the default notes merge strategy. Document the option in config.txt and git-notes.txt Add tests for the configuration option. Ensure that command line --strategy option overrides

Re: Error pushing new branch: value too great for base (error token is...

2015-08-10 Thread Jacob Keller
On Mon, Aug 10, 2015 at 2:54 AM, Gaurav Chhabra varuag.chha...@gmail.com wrote: Apologies for the delay in reply! I tried your suggestion and it works. Thanks! :) I'm curious why integer comparison is throwing error. Shouldn't i be comparing numbers with numeric operator? Yes, but shell

[PATCH v5 3/4] notes: add notes.mergestrategy option to select default strategy

2015-08-14 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Teach git-notes about notes.mergestrategy to select a general strategy for all notes merges. This enables a user to always get expected merge strategy such as cat_sort_uniq without having to pass the -s option manually. Signed-off-by: Jacob Keller

[PATCH v5 4/4] notes: teach git-notes about notes.ref.mergestrategy option

2015-08-14 Thread Jacob Keller
From: Jacob Keller jacob.kel...@gmail.com Add new option notes.ref.mergestrategy option which specifies the merge strategy for merging into a given notes ref. This option enables selection of merge strategy for particular notes refs, rather than all notes ref merges, as user may not want

  1   2   3   4   5   6   7   8   9   10   >