[PATCH v4] for-each-ref: Always check stat_tracking_info()'s return value.

2015-01-05 Thread Raphael Kubo da Costa
The code handling %(upstream:track) and %(upstream:trackshort) assumed it always had a valid branch that had been sanitized earlier in populate_value(), and thus did not check the return value of the call to stat_tracking_info(). While there is indeed some sanitization code that basically

Re: [PATCH] remote-curl: fall back to Basic auth if Negotiate fails.

2015-01-05 Thread Dan Langille (dalangil)
On Dec 26, 2014, at 11:01 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Apache servers using mod_auth_kerb can be configured to allow the user to authenticate either using Negotiate (using the Kerberos ticket) or Basic authentication (using the Kerberos password). Often, one

[PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)

2015-01-05 Thread Nguyễn Thái Ngọc Duy
From: Junio C Hamano gits...@pobox.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- This is in the SQUASH??? commit on nd/untracked-cache on 'pu', but it fixes a commit older than that series. builtin/clean.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH v3] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-05 Thread Philip Oakley
The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Overhaul the general wording thus: 1. direct description of what is ignored given first. 2. example instruction of the user manual

Re: git 2.2.x: Unexpected, overstrict file permissions after git update-server-info

2015-01-05 Thread Torsten Bögershausen
On 2015-01-05 20.07, Paul Sokolovsky wrote: Hello, We recently upgraded to git 2.2.1 from 2.1.x and faced issue with accessing repositories over dump HTTP protocol. In our setting, repositories are managed by Gerrit, so owned by Gerrit daemon user, but we also offer anon access via smart

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-05 Thread brian m. carlson
On Mon, Jan 05, 2015 at 09:23:32PM +, Dan Langille (dalangil) wrote: I have tried both patches. Neither succeeds here. I patched git version 2.2.1 but I don’t think that affects this. You are patching the client side, correct? That's the side that needs patching here. Just so the

Question about the revision walking API

2015-01-05 Thread Mike Hommey
Hi, I would like to know if the revision walking API works as one would expect with a calling sequence like the following: - init_revisions - add_pending_object/setup_revisions - prepare_revision_walk - get_revision (repeated) - reset_revision_walk (I guess) - add_pending_object -

Re: git 2.2.x: Unexpected, overstrict file permissions after git update-server-info

2015-01-05 Thread Jeff King
On Mon, Jan 05, 2015 at 09:07:24PM +0200, Paul Sokolovsky wrote: So, after the upgrade, users started to report that accessing info/refs file of a repo, as required for HTTP dump protocol, leads to 403 Forbidden HTTP error. We traced that to 0600 filesystem permissions for such files (for

[PATCH 1/2] t1301: set umask in reflog sharedrepository=group test

2015-01-05 Thread Jeff King
The t1301 script sets the umask globally before many of the tests. Most of the tests that care about the umask then set it explicitly at the start of the test. However, one test does not, and relies on the 077 umask setting from earlier tests. This is fragile and can break if another test is added

[PATCH 2/2] update-server-info: create info/* with mode 0666

2015-01-05 Thread Jeff King
Prior to d38379e (make update-server-info more robust, 2014-09-13), we used a straight fopen to create the info/refs and objects/info/packs files, which creates the file using mode 0666 (less the default umask). In d38379e, we switched to creating the file with mkstemp to get a unique filename.

Re: bearer token authorization with HTTPS transport

2015-01-05 Thread brian m. carlson
On Tue, Dec 30, 2014 at 08:42:10PM -0500, Jeff King wrote: Another option would be to just teach the credential code to accept a bearer field from a credential helper. We would need to: 1. Teach the credential code that getting a bearer token is sufficient (it does not need to prompt for

Re: [PATCHv9 1/9] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-05 Thread Stefan Beller
On Sat, Jan 3, 2015 at 1:53 AM, Duy Nguyen pclo...@gmail.com wrote: On Sat, Jan 3, 2015 at 9:20 AM, Jonathan Nieder jrnie...@gmail.com wrote: - if (shallow_update !checked_connectivity) - error(BUG: run 'git fsck' for safety.\n - If there are errors, try to

Re: What's cooking in git.git (Dec 2014, #05; Mon, 29)

2015-01-05 Thread Jonathan Nieder
Stefan Beller wrote: On Mon, Dec 29, 2014 at 1:28 PM, Junio C Hamano gits...@pobox.com wrote: * sb/copy-fd-errno (2014-11-17) 1 commit - copy.c: make copy_fd preserve meaningful errno Will be rerolled as a part of a larger series. I am not expecting to reroll this as part of a larger

Re: [PATCHv10 02/10] receive-pack.c: die instead of error in assure_connectivity_checked

2015-01-05 Thread Jonathan Nieder
Stefan Beller wrote: --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1055,15 +1055,15 @@ static void assure_connectivity_checked(struct command *commands, for (cmd = commands; cmd; cmd = cmd-next) { if (should_process_cmd(cmd)

Re: [PATCHv10 01/10] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-05 Thread Jonathan Nieder
Stefan Beller wrote: --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c [...] @@ -1077,27 +1100,15 @@ static void execute_commands(struct command *commands, [...] + if (shallow_update) + assure_connectivity_checked(commands, si); Looking at this code alone, it seems

[PATCHv10 01/10] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-05 Thread Stefan Beller
Make the main execute_commands loop in receive-pack easier to read by splitting out some steps into helper functions. The new helper 'should_process_cmd' checks if a ref update is unnecessary, whether due to an error having occurred or for another reason. The helper 'assure_connectivity_checked'

[PATCHv10 02/10] receive-pack.c: die instead of error in assure_connectivity_checked

2015-01-05 Thread Stefan Beller
Discussion on the previous patch revealed we rather want to err on the safe side. To do so we need to stop receive-pack in case of the possible future bug when connectivity is not checked on a shallow push. Suggested-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Stefan Beller

git 2.2.x: Unexpected, overstrict file permissions after git update-server-info

2015-01-05 Thread Paul Sokolovsky
Hello, We recently upgraded to git 2.2.1 from 2.1.x and faced issue with accessing repositories over dump HTTP protocol. In our setting, repositories are managed by Gerrit, so owned by Gerrit daemon user, but we also offer anon access via smart and dumb HTTP protocols. For the latter, we of

[RFC PATCH] format-patch: Add config option format.coverbodytext to change the cover letter body

2015-01-05 Thread Stefan Beller
When sending out patch series one of the last things doing is writing the cover letter. The cover letter would be a good place to remind people to check the todo list for sending patches. As people have different levels of confidence and sloppiness this todo list may be lengthier for some people

[PATCH] test-lib.sh: do tests for color support after changing HOME

2015-01-05 Thread Richard Hansen
If ncurses needs ~/.terminfo for the current $TERM, then tput will succeed before changing HOME to $TRASH_DIRECTORY but fail afterward. Move the tests that determine whether there is color support after changing HOME so that color=t is set if and only if tput would succeed when say_color() is run.

Re: What's cooking in git.git (Dec 2014, #05; Mon, 29)

2015-01-05 Thread Stefan Beller
On Mon, Dec 29, 2014 at 1:28 PM, Junio C Hamano gits...@pobox.com wrote: * sb/copy-fd-errno (2014-11-17) 1 commit - copy.c: make copy_fd preserve meaningful errno Will be rerolled as a part of a larger series. I am not expecting to reroll this as part of a larger series any more. So if

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-05 Thread Dan Langille (dalangil)
I’ve found the latest patch. Trying this now. Thanks. — Dan Langille Infrastructure Operations Talos Group Sourcefire, Inc. On Jan 1, 2015, at 2:56 PM, brian m. carlson sand...@crustytoothpaste.net wrote: Apache servers using mod_auth_kerb can be configured to allow the user to

Re: [PATCH v2] doc: core.ignoreStat update, and clarify the --assume-unchanged effect

2015-01-05 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Philip Oakley philipoak...@iee.org writes: The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Signed-off-by: Philip Oakley philipoak...@iee.org

Re: [PATCHv10 01/10] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-05 Thread Stefan Beller
On Mon, Jan 5, 2015 at 12:22 PM, Jonathan Nieder jrnie...@gmail.com wrote: Stefan Beller wrote: --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c [...] @@ -1077,27 +1100,15 @@ static void execute_commands(struct command *commands, [...] + if (shallow_update) +

Re: [PATCHv10 02/10] receive-pack.c: die instead of error in assure_connectivity_checked

2015-01-05 Thread Stefan Beller
On Mon, Jan 5, 2015 at 12:17 PM, Jonathan Nieder jrnie...@gmail.com wrote: Stefan Beller wrote: --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1055,15 +1055,15 @@ static void assure_connectivity_checked(struct command *commands, for (cmd = commands; cmd; cmd =

Re: [PATCHv10 01/10] receive-pack.c: shorten the execute_commands loop over all commands

2015-01-05 Thread Jonathan Nieder
Stefan Beller wrote: On Mon, Jan 5, 2015 at 12:22 PM, Jonathan Nieder jrnie...@gmail.com wrote: Stefan Beller wrote: --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c [...] @@ -1077,27 +1100,15 @@ static void execute_commands(struct command *commands, [...] + if

Re: [PATCH v2] remote-curl: fall back to Basic auth if Negotiate fails

2015-01-05 Thread Dan Langille (dalangil)
I have tried both patches. Neither succeeds here. I patched git version 2.2.1 but I don’t think that affects this. Before I flood the list with debug runs, I wanted to make sure I was testing with an appropriate configuration: Location /git SSLOptions +StdenvVars Options +ExecCGI

Re: [PATCHv10 02/10] receive-pack.c: die instead of error in assure_connectivity_checked

2015-01-05 Thread Jonathan Nieder
Stefan Beller wrote: Maybe we should do both? die (BUG: Some refs have not been checked for connectivity. Please contact the git developers (git@vger.kernel.org) and report the problem. As a workaround run 'git fsck'. If there are errors, try to remove the