rebase with unknown -s parameter discards commits

2015-08-14 Thread Szunti
git version: 2.5.0 Archlinux Hi, 'git rebase -s nonsense master' gives an error message but still changes the branch. $git rebase -s nonsense master topic First, rewinding head to replay your work on top of it... /usr/lib/git-core/git-rebase--merge: line 70: git-merge-nonsense: command not f

Re: [PATCH 6/7] Support signing pushes iff the server supports it

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > diff --git a/send-pack.c b/send-pack.c > index 2a64fec..6ae9f45 100644 > --- a/send-pack.c > +++ b/send-pack.c > @@ -370,7 +370,7 @@ int send_pack(struct send_pack_args *args, > args->use_thin_pack = 0; > if (server_supports("atomic")) > a

Re: [PATCH 5/7] transport: Remove git_transport_options.push_cert

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > This field was set in transport_set_option, but never read in the push > code. The push code basically ignores the smart_options field > entirely, and derives its options from the flags arguments to the > push* callbacks. Note that in git_transport_push there are already >

Re: [PATCH 1/7] Documentation/git-push.txt: Document when --signed may fail

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > Like --atomic, --signed will fail if the server does not advertise the > necessary capability. In addition, it requires gpg on the client side. > > Signed-off-by: Dave Borowitz > --- > Documentation/git-push.txt | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-)

Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:11 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index 75ec02e8e90a..de67ad1fdedf 100644 >> --- a/Documentation/config.txt >> +++ b/Documentation/config.txt >> @@ -1947,8 +1947,8 @@ notes.rewrite

Re: [PATCH v7 4/4] notes: teach git-notes about notes..mergestrategy option

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:10 PM, Eric Sunshine wrote: > On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano wrote: >> Jacob Keller writes: >>> diff --git a/builtin/notes.c b/builtin/notes.c >>> index 12a42b583f98..bdfd9c7d29b4 100644 >>> --- a/builtin/notes.c >>> +++ b/builtin/notes.c >>> +

Re: [PATCH v7 4/4] notes: teach git-notes about notes..mergestrategy option

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 3:01 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> diff --git a/builtin/notes.c b/builtin/notes.c >> index 12a42b583f98..bdfd9c7d29b4 100644 >> --- a/builtin/notes.c >> +++ b/builtin/notes.c >> ... >> @@ -833,7 +833,14 @@ static int merge(int argc, const char **arg

Re: [PATCH v2] utf8.c: print warning about iconv errors

2015-08-14 Thread Junio C Hamano
Max Kirillov writes: > * do not limit number of warnings - does not worth complicating the code Unless the warning leads to a quick "die()", wouldn't this make Git unusable by spewing a "falling back to verbatim copy" for each and every line of the message of a commit that has 'encoding' element

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 6:22 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano wrote: >>> Eric Sunshine writes: Nevertheless, there's still the problem, due to 527ec39 (generate-cmdlist: parse common group commands, 2015-05-21), tha

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Junio C Hamano
Eric Sunshine writes: > On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano wrote: >> Eric Sunshine writes: >>> Nevertheless, there's still the problem, due to 527ec39 >>> (generate-cmdlist: parse common group commands, 2015-05-21), that git >>> doesn't build at all anymore when Perl is unavailable

Re: [PATCH v7 1/4] notes: document cat_sort_uniq rewriteMode

2015-08-14 Thread Junio C Hamano
Jacob Keller writes: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 75ec02e8e90a..de67ad1fdedf 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1947,8 +1947,8 @@ notes.rewriteMode:: > When copying notes during a rewrite (see the >

Re: [PATCH v7 4/4] notes: teach git-notes about notes..mergestrategy option

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 6:01 PM, Junio C Hamano wrote: > Jacob Keller writes: >> diff --git a/builtin/notes.c b/builtin/notes.c >> index 12a42b583f98..bdfd9c7d29b4 100644 >> --- a/builtin/notes.c >> +++ b/builtin/notes.c >> + strbuf_addf(&merge_key, "notes.%s.mergestrategy", short_ref

[PATCH v2] utf8.c: print warning about iconv errors

2015-08-14 Thread Max Kirillov
If reencoding a text data from one encoding to another fails, the original version is used insted. Currently there is no warning about failed reencoding, which can have an undesired outcome that returned data is incorrect but user is not aware about it. Add printing warning when conversion fails.

Re: [PATCH v7 4/4] notes: teach git-notes about notes..mergestrategy option

2015-08-14 Thread Junio C Hamano
Jacob Keller writes: > diff --git a/builtin/notes.c b/builtin/notes.c > index 12a42b583f98..bdfd9c7d29b4 100644 > --- a/builtin/notes.c > +++ b/builtin/notes.c > ... > @@ -833,7 +833,14 @@ static int merge(int argc, const char **argv, const char > *prefix) > usage_with_opti

Re: [PATCHv5] http: add support for specifying the SSL version

2015-08-14 Thread Junio C Hamano
Elia Pinto writes: > Teach git about a new option, "http.sslVersion", which permits one to > specify the SSL version to use when negotiating SSL connections. The > setting can be overridden by the GIT_SSL_VERSION environment > variable. > > Signed-off-by: Elia Pinto > --- > This is the fifth v

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 5:02 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> Nevertheless, there's still the problem, due to 527ec39 >> (generate-cmdlist: parse common group commands, 2015-05-21), that git >> doesn't build at all anymore when Perl is unavailable. > > I do not think that is a

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

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

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(

[PATCH v7 0/4] notes.mergestrategy option(s)

2015-08-14 Thread Jacob Keller
From: Jacob Keller Changes since v6 * Eric suggested a more stream-lined approach for git_config_get_notes_strategy Jacob Keller (4): notes: document cat_sort_uniq rewriteMode notes: add tests for --commit/--abort/--strategy exclusivity notes: add notes.mergestrategy option to select def

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/con

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller Add new option "notes..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 cat_sort_uniq for all refs, but

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

2015-08-14 Thread Jacob Keller
On Fri, Aug 14, 2015 at 2:06 PM, Eric Sunshine 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); > return 0; > } >

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

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 4:48 PM, Jacob Keller wrote: > From: Jacob Keller > > 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

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > Ok, so let us bikeshed a bit further. > > Bikeshed 1. > Option A: --signed/--no-signed--signed-if-possible > Option B: --signed=true|false|if-possible, "--signed" alone implies "=true". > > Bikeshed 2. > > Option A: if-possible > > The possibly confusing thing is one might

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Junio C Hamano
Eric Sunshine writes: > Nevertheless, there's still the problem, due to 527ec39 > (generate-cmdlist: parse common group commands, 2015-05-21), that git > doesn't build at all anymore when Perl is unavailable. I do not think that is anything new. We always have assumed "some" version of Perl ava

Re: [PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Junio C Hamano
Sven Strickroth writes: > Without this patch there might be open file handle leaks. > > Signed-off-by: Sven Strickroth > Signed-off-by: Sup Yut Sum Who are these two people and how are they related to this change? I am wondering if "Sup" is the author of this change and "Sven" is only relaying

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Dave Borowitz
On Fri, Aug 14, 2015 at 4:45 PM, Junio C Hamano wrote: > Dave Borowitz writes: > >> On Fri, Aug 14, 2015 at 2:12 PM, Junio C Hamano wrote: >>> Yes, it looks somewhat strange. >> ... The straw-man >> strangeness is that two of them are the traditional boolean values >> "true/false" and the third

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

2015-08-14 Thread David Turner
On Fri, 2015-08-14 at 13:27 -0700, Junio C Hamano wrote: > David Turner writes: > > > Random side note: the present workspace path name component is not > > acceptable for this if alternate ref backends use a single db for > > storage across all workspaces. That's because you might create a > >

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

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

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/con

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 3:59 PM, Junio C Hamano wrote: > Renato Botelho writes: >> I also found that some commands require perl when NO_PERL is set: > > NO_PERL merely means "I want to build a subset of Git that is meant > to be usable on a system without a working Perl installed". These > scrip

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(

[PATCH v6 0/4] notes.mergestrategy config option

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 the configuration at all unless we ne

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller Add new option "notes..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 cat_sort_uniq for all refs, but

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > On Fri, Aug 14, 2015 at 2:12 PM, Junio C Hamano wrote: >> Yes, it looks somewhat strange. > ... The straw-man > strangeness is that two of them are the traditional boolean values > "true/false" and the third is "file not found^W^W^Wif-possible" :) It actually is not unco

Re: [PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 4:21 PM, Sven Strickroth wrote: > Without this patch there might be open file handle leaks. > > Signed-off-by: Sven Strickroth > Signed-off-by: Sup Yut Sum Better. Thanks. Reviewed-by: Eric Sunshine > --- > diff --git a/config.c b/config.c > index 9fd275f..83caa25 100

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Dave Borowitz
On Fri, Aug 14, 2015 at 2:12 PM, Junio C Hamano wrote: >> The "if-possible" name and weird tri-state boolean is basically a straw man, >> and I am happy to change if someone has a clearer suggestion. > > Yes, it looks somewhat strange. Let me go on a slight tangent to > explain why I think it is

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Dave Borowitz
On Fri, Aug 14, 2015 at 2:12 PM, Junio C Hamano wrote: > So I am fine as long as "if-possible" turns a failure to make signed > push into a success _only_ when the reason of the failure is because > we did not see the capability supported by the receiving end. If > the reason why you cannot do a

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

2015-08-14 Thread Junio C Hamano
David Turner writes: > Random side note: the present workspace path name component is not > acceptable for this if alternate ref backends use a single db for > storage across all workspaces. That's because you might create a > workspace at foo, then manually rm -r it, and then create a new one a

[PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Sven Strickroth
Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 9fd275f..83caa25 100644 --- a/config.c +++ b/config.c @@ -1935,7 +19

Re: [PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 4:03 PM, Sven Strickroth wrote: > Without this patch there might be open file handle leaks. > > Signed-off-by: Sven Strickroth > Signed-off-by: Sup Yut Sum > --- > diff --git a/config.c b/config.c > index 9fd275f..8138d5d 100644 > --- a/config.c > +++ b/config.c > @@ -206

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

2015-08-14 Thread David Turner
On Fri, 2015-08-14 at 10:04 -0700, Junio C Hamano wrote: > Michael Haggerty writes: > > > Let's take a step back. > > > > We have always had a ton of code that uses `git_path()` and friends to > > convert abstract things into filesystem paths. Let's take the > > reference-handling code as an exam

[PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Sven Strickroth
Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.c b/config.c index 9fd275f..8138d5d 100644 --- a/config.c +++ b/config.c @@ -2065,6 +2065,7 @@ int git_c

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Junio C Hamano
Renato Botelho writes: > I also found that some commands require perl when NO_PERL is set: > > git-submodule > git-request-pull > git-am > > Definitely NO_PERL is not working as expected. NO_PERL merely means "I want to build a subset of Git that is meant to be usable on a system without a worki

Re: [PATCHv5] http: add support for specifying the SSL version

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 3:37 PM, Elia Pinto wrote: > Teach git about a new option, "http.sslVersion", which permits one to > specify the SSL version to use when negotiating SSL connections. The > setting can be overridden by the GIT_SSL_VERSION environment > variable. > > Signed-off-by: Elia Pin

Re: [PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 3:44 PM, Sven Strickroth wrote: > Without this patch there might be open file handle leaks. Thanks, this looks better. One comment below... > Signed-off-by: Sven Strickroth > Signed-off-by: Sup Yut Sum > --- > diff --git a/config.c b/config.c > index 9fd275f..c06dc2f 10

Re: [PATCH v3] http: add support for specifying the SSL version

2015-08-14 Thread Elia Pinto
2015-08-14 19:21 GMT+02:00 Junio C Hamano : > Torsten Bögershausen writes: > >>> diff --git a/Documentation/config.txt b/Documentation/config.txt >>> index 315f271..b23b01a 100644 >>> --- a/Documentation/config.txt >>> +++ b/Documentation/config.txt >>> @@ -1595,6 +1595,28 @@ http.saveCookies:: >>

[PATCH] Correctly close config file handle in case of error

2015-08-14 Thread Sven Strickroth
Without this patch there might be open file handle leaks. Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- config.c | 4 1 file changed, 4 insertions(+) diff --git a/config.c b/config.c index 9fd275f..c06dc2f 100644 --- a/config.c +++ b/config.c @@ -2010,6 +2010,7 @@ int git_

[PATCH] vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

2015-08-14 Thread Sven Strickroth
W/o this fix there is one character missing at the end. Signed-off-by: Sven Strickroth --- compat/snprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/snprintf.c b/compat/snprintf.c index 42ea1ac..0b11688 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@

Re: [PATCH] Close config file handle if the entry to unset is not found

2015-08-14 Thread Sven Strickroth
Am 14.08.2015 um 21:35 schrieb Eric Sunshine: >> Signed-off-by: Sup Yut Sum >> Signed-off-by: Sven Strickroth >> --- >> diff --git a/config.c b/config.c >> index 9fd275f..89b49e3 100644 >> --- a/config.c >> +++ b/config.c >> @@ -2048,6 +2048,7 @@ int git_config_set_multivar_in_file(const char >>

[PATCHv5] http: add support for specifying the SSL version

2015-08-14 Thread Elia Pinto
Teach git about a new option, "http.sslVersion", which permits one to specify the SSL version to use when negotiating SSL connections. The setting can be overridden by the GIT_SSL_VERSION environment variable. Signed-off-by: Elia Pinto --- This is the fifth version of the patch. Changes from th

Re: [PATCH] Close config file handle if the entry to unset is not found

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 3:18 PM, Sven Strickroth wrote: > Without this patch there might be open handle leaks. Thanks for the patch. A question below... > Signed-off-by: Sup Yut Sum > Signed-off-by: Sven Strickroth > --- > diff --git a/config.c b/config.c > index 9fd275f..89b49e3 100644 > ---

[PATCH] Close config file handle if the entry to unset is not found

2015-08-14 Thread Sven Strickroth
Without this patch there might be open handle leaks. Signed-off-by: Sup Yut Sum Signed-off-by: Sven Strickroth --- config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/config.c b/config.c index 9fd275f..89b49e3 100644 --- a/config.c +++ b/config.c @@ -2048,6 +2048,7 @@ int git_config_se

Re: [PATCH 01/10] ref-filter: add option to filter only branches

2015-08-14 Thread Karthik Nayak
On Fri, Aug 14, 2015 at 9:26 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Thu, Aug 13, 2015 at 5:05 PM, Karthik Nayak wrote: >>> On Thu, Aug 13, 2015 at 4:21 PM, Karthik Nayak >>> wrote: This was taken from branch.c, I thought of using an enum instead but that would

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Junio C Hamano
Dave Borowitz writes: > Remembering to pass --signed to git push on every push is extra typing that is > easy to forget, and just leads to annoyance if the remote has a hook that > makes > signed pushes required. Add a config option push.gpgSign, analogous to > commit.gpgSign, allowing users to

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

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 1:50 PM, Jacob Keller wrote: > 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-

Re: [PATCHv4] http: add support for specifying the SSL version

2015-08-14 Thread Eric Sunshine
On Fri, Aug 14, 2015 at 12:35 PM, Elia Pinto wrote: > Teach git about a new option, "http.sslVersion", which permits one to > specify the SSL version to use when negotiating SSL connections. The > setting can be overridden by the GIT_SSL_VERSION environment > variable. > > Signed-off-by: Elia Pi

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/con

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller Add new option "notes..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 cat_sort_uniq for all refs, but

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

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

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

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 --- Documentation/config.txt| 4 ++-- Documentation/git-notes.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(

[PATCH v5 0/4] notes mergestrategy configuration option

2015-08-14 Thread Jacob Keller
From: Jacob Keller 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 as a notes..mergestrategy option

Re: [PATCH v10 05/13] ref-filter: implement an `align` atom

2015-08-14 Thread Junio C Hamano
Karthik Nayak writes: > On Thu, Aug 13, 2015 at 1:54 AM, Junio C Hamano wrote: > >> I think the most generic way to think about this is to consider that >> the most fully spelled form of align would be this: >> >> %(align:width=12,position=left) >> >> And another rule you would have is t

Re: [PATCH v3] http: add support for specifying the SSL version

2015-08-14 Thread Junio C Hamano
Torsten Bögershausen writes: >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index 315f271..b23b01a 100644 >> --- a/Documentation/config.txt >> +++ b/Documentation/config.txt >> @@ -1595,6 +1595,28 @@ http.saveCookies:: >> If set, store cookies received during requests

Re: [PATCH v3 3/4] refs: make refs/worktree/* per-worktree

2015-08-14 Thread Junio C Hamano
Michael Haggerty writes: > I don't see how that can help. The result of a pipeline is taken from > the last command. The exit codes of earlier commands in the pipeline are > lost in the sands of time: > > $ false | true > $ echo $? > 0 > $ false | ( ! false ) > $ echo $? >

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

2015-08-14 Thread Junio C Hamano
Michael Haggerty writes: > Let's take a step back. > > We have always had a ton of code that uses `git_path()` and friends to > convert abstract things into filesystem paths. Let's take the > reference-handling code as an example: > ... > This seems crazy to me. It is the *reference* code that sh

Re: [bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Renato Botelho
Renato Botelho FreeBSD.org> writes: > > I was working on update git on FreeBSD ports tree to 2.5.0 and I noted 2.5.0 > is trying to use perl even when it's being built with NO_PERL knob. > > /bin/sh: /usr/bin/perl: not found > Makefile:1701: recipe for target 'common-cmds.h' failed > gmake[2]:

[PATCHv4] http: add support for specifying the SSL version

2015-08-14 Thread Elia Pinto
Teach git about a new option, "http.sslVersion", which permits one to specify the SSL version to use when negotiating SSL connections. The setting can be overridden by the GIT_SSL_VERSION environment variable. Signed-off-by: Elia Pinto --- This is the fourth revision of the patch. Changes from

Re: [PATCH v10 04/13] utf8: add function to align a string into given strbuf

2015-08-14 Thread Junio C Hamano
Eric Sunshine writes: > Please extend this documentation to state explicitly that this > function preserves (does not truncate) the input string if it is wider > than 'width'. That's quite important information for the caller to > know. > > (Aside: I could easily see this function being extended

Re: [PATCH 01/10] ref-filter: add option to filter only branches

2015-08-14 Thread Junio C Hamano
Karthik Nayak writes: > On Thu, Aug 13, 2015 at 5:05 PM, Karthik Nayak wrote: >> On Thu, Aug 13, 2015 at 4:21 PM, Karthik Nayak wrote: >>> >>> This was taken from branch.c, I thought of using an enum instead but that >>> would again require most of branch.c, hence it's been carried over >>> wit

Re: [PATCH v10 05/13] ref-filter: implement an `align` atom

2015-08-14 Thread Karthik Nayak
On Thu, Aug 13, 2015 at 1:54 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Wed, Aug 12, 2015 at 10:43 PM, Junio C Hamano wrote: >> ... >>> %(objectname:abbrev=8). To specify two modification magics, each of >>> which takes a number, the user would say e.g. >>> >>> %(objectname:a

[bug] 2.5.0 build with NO_PERL is broken

2015-08-14 Thread Renato Botelho
I was working on update git on FreeBSD ports tree to 2.5.0 and I noted 2.5.0 is trying to use perl even when it's being built with NO_PERL knob. /bin/sh: /usr/bin/perl: not found Makefile:1701: recipe for target 'common-cmds.h' failed gmake[2]: *** [common-cmds.h] Error 127 gmake[2]: *** Waiting f

Re: git merge changes file mode from 644 to 755

2015-08-14 Thread Johannes Sixt
Am 14.08.2015 um 14:02 schrieb Dmitry Oksenchuk: Hello, I've noticed strange behavior of git merge on Windows with core.filemode=false (set by default). Git changed mode of some files from 644 to 755 for unknown reason. One of the files is stdafx.cpp, it's absent in the common ancestor, it was a

Re: git svn clone fails

2015-08-14 Thread Jörg Schaible
Hi Thorsten, there's more fun though. GIT (2.4.6) fails differently if I add additionally the "--no-minimize-url": %< = [...] W: -empty_dir: trunk/src/test/serialization/com/elsagsolutions r40223 = 7983efa910e6cd606cc63a6b6b365048df1e11a9 (refs/remotes/origi

git merge changes file mode from 644 to 755

2015-08-14 Thread Dmitry Oksenchuk
Hello, I've noticed strange behavior of git merge on Windows with core.filemode=false (set by default). Git changed mode of some files from 644 to 755 for unknown reason. One of the files is stdafx.cpp, it's absent in the common ancestor, it was added in the first branch (master) with mode 644 and

Re: git svn clone fails

2015-08-14 Thread Torsten Bögershausen
On 2015-08-14 12.38, Jörg Schaible wrote: > Any idea how to proceed? Git itself doesn't version empty directories at all, only files (and soft links, sub modules). Git creates a directory as a "side effect" to be able to store files there. May be I am off-topic, but would it be possible to f

Re: [PATCH 0/7] Flags and config to sign pushes by default

2015-08-14 Thread Chris Packham
Bike shedding a little (I've never used the signed push functionality) On Fri, Aug 14, 2015 at 7:00 AM, Dave Borowitz wrote: > The "if-possible" name and weird tri-state boolean is basically a straw man, > and I am happy to change if someone has a clearer suggestion. what about git push --signed

Re: git svn clone fails

2015-08-14 Thread Jörg Schaible
Hi Torsten, thanks for an answer ... Torsten Bögershausen wrote: > On 2015-08-14 09.51, Jörg Schaible wrote: > I can't reproduce it here: > > git svn clone http://websvn/svn/essvn/standard/java-commons/lang > Initialized empty Git repository in /home/xx/lang/.git/ > RA layer request failed: OP

Re: git svn clone fails

2015-08-14 Thread Torsten Bögershausen
On 2015-08-14 09.51, Jörg Schaible wrote: I can't reproduce it here: git svn clone http://websvn/svn/essvn/standard/java-commons/lang Initialized empty Git repository in /home/xx/lang/.git/ RA layer request failed: OPTIONS of 'http://websvn/svn/essvn/standard/java-commons/lang': Could not resolve

Re: [PATCH v3 3/4] refs: make refs/worktree/* per-worktree

2015-08-14 Thread Michael Haggerty
On 08/13/2015 10:32 PM, David Turner wrote: > On Thu, 2015-08-13 at 22:16 +0200, Michael Haggerty wrote: >> On 08/13/2015 07:41 PM, David Turner wrote: >>> On Thu, 2015-08-13 at 13:15 -0400, Eric Sunshine wrote: On Wed, Aug 12, 2015 at 5:57 PM, David Turner wrote: > diff --git a/t/t

Re: git svn clone fails

2015-08-14 Thread Jörg Schaible
Is there really no other place for a bug report? This will simply vanish in the list's noise ... Jörg Schaible wrote: > Hmmm. Is this the proper channel to report issues or should I go somewhere > else? > > Jörg Schaible wrote: > >> Hello guys, >> >> we have to turn some projects managed by S