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
.
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
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
, 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
...@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
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
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
...@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
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
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
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
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
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
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
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
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
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
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
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;
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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()'
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
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
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
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
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
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
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
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')
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
From: Jacob Keller jacob.kel...@gmail.com
I have tried to cover all of the comments since the last sending of
this series. I am not 100% sure if I got everything, so please feel free
to respond again if I missed something.
This series implements the notes.mergestrategy option, as well
On Fri, Aug 14, 2015 at 2:06 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
const char *value;
if (!git_config_get_string_const(key, value)) {
if (parse_notes_strategy(value, strategy))
git_die_config(key, unknown notes merge strategy '%s', value);
On Fri, Aug 14, 2015 at 3:10 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.e.kel...@intel.com writes:
diff --git a/builtin/notes.c b/builtin/notes.c
index 12a42b583f98..bdfd9c7d29b4 100644
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
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
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
From: Jacob Keller jacob.kel...@gmail.com
Changes since v6:
* use a static git_config_get_notes_strategy function
* use git_die_config to display useful information about which
configuration failed.
This should address Eric's concern. It also makes it so that we don't
even read
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
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
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
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
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
1 - 100 of 1094 matches
Mail list logo
