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

2015-01-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: Yeah, I didn't consider the mode impact of using mkstemp. That is definitely a regression that should be fixed. Though of course if you really do want 0644, you should set your umask to 0022. :) ... If you haven't set core.sharedrepository, then

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Now, however, since refs/heads/master exists and the new, more relaxed notes refs rules leave it unchanged, the merge succeeds. ... ... diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh index 24d82b49..f0feb64b 100755 ---

Re: Question about the revision walking API

2015-01-06 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: 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

[PATCH 1/2] log.c: fix translation markings

2015-01-06 Thread Kyle J. McKay
The parse_options API expects an array of alternative usage lines to which it automatically ads the language-appropriate or when displaying. Each of these options is marked for translation with N_ and then later translated when gettext is called on each element of the array. Since the N_ macro

[PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Kyle J. McKay
The N_ macro is used to mark strings for translation without actually translating them. At runtime the string is expected to be passed to the gettext API for translation. If two N_ macro invocations appear next to each other with only whitespace (or nothing at all) between them, the two separate

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

2015-01-06 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: 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. I do not quite understand. Wouldn't a check-list be useful

[PATCH v2 1/2] notes: accept any ref

2015-01-06 Thread Kyle J. McKay
From: Scott Chacon scha...@gmail.com Currently if you try to merge notes, the notes code ensures that the reference is under the 'refs/notes' namespace. In order to do any sort of collaborative workflow, this doesn't work well as you can't easily have local notes refs seperate from remote notes

[PATCH v2 0/2] Accept any notes ref

2015-01-06 Thread Kyle J. McKay
This is a resend of the original patch by Scott Chacon combined with the suggested patch by Johan Herland with a summary of the discussion so far in the hope to restart discussion about including this change. The original thread can be found at [1]. The history so far: The Patch 1/2 was

[PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
With the recent change to allow notes refs to be located in the refs hierarchy in locations other than refs/notes/ the 'git notes merge refs/heads/master' test started succeeding. Previously refs/heads/master would have been expanded to a non-existing, ref refs/notes/refs/heads/master, and the

[PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Kyle J. McKay
Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Since only Tcl 8.4 is required this presents a problem. The extended syntax was used starting with Git 2.0.0 in commit b3f0c5c0 so that a major version change would still satisfy the condition. However, what we

Re: Question about the revision walking API

2015-01-06 Thread Mike Hommey
On Tue, Jan 06, 2015 at 02:24:58AM -0800, Junio C Hamano wrote: Mike Hommey m...@glandium.org writes: 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 -

[PATCH] imap-send.c: support GIT_CURL_VERBOSE

2015-01-06 Thread Kyle J. McKay
When using git-imap-send to send via cURL, support setting the GIT_CURL_VERBOSE environment variable to enable cURL's verbose mode. The existing http.c code already supports this and does it by simply checking to see whether or not the environment variable exists -- it does not examine the value

[PATCH] imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

2015-01-06 Thread Kyle J. McKay
According to the cURL documentation for the CURLOPT_USE_SSL option, it is only used with plain text protocols that get upgraded to SSL using the STARTTLS command. The server.use_ssl variable is only set when we are using a protocol that is already SSL/TLS (i.e. imaps), so setting CURLOPT_USE_SSL

3.5% EASY FAST LOAN FROM WONGA

2015-01-06 Thread WONGA CASH LOAN
OPEN THE ATTACHED FILE FOR DETAILS 3.5% EASY FAST LOAN.pdf Description: Adobe PDF document

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

2015-01-06 Thread Paul Sokolovsky
Hello, On Mon, 5 Jan 2015 22:47:02 -0500 Jeff King p...@peff.net wrote: 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

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 02:20, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: Now, however, since refs/heads/master exists and the new, more relaxed notes refs rules leave it unchanged, the merge succeeds. ... ... diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh index

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

2015-01-06 Thread Paul Sokolovsky
Hello, On Tue, 06 Jan 2015 02:08:16 -0800 Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Yeah, I didn't consider the mode impact of using mkstemp. That is definitely a regression that should be fixed. Though of course if you really do want 0644, you should set

Re: [PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Ramsay Jones
On 06/01/15 10:34, Kyle J. McKay wrote: The N_ macro is used to mark strings for translation without actually translating them. At runtime the string is expected to be passed to the gettext API for translation. If two N_ macro invocations appear next to each other with only whitespace (or

RE: Software CM Tool Inquiry

2015-01-06 Thread Jason Pyeron
Responses inline. -Original Message- From: Campbell, Polly R CTR Maritime EW Sys Div, WXMP Sent: Tuesday, January 06, 2015 8:58 To Whom It May Concern, We are a software support activity for a system that is loaded on a majority of the ships in the navy fleet; I am looking for

Re: [PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 05:24, Ramsay Jones wrote: On 06/01/15 10:34, Kyle J. McKay wrote: Avoid this by adding parentheses around the expansion of the N_ macro so that instead of ending up with two adjacent strings that are then combined by the preprocessor, two adjacent strings surrounded by

Re: Question about the revision walking API

2015-01-06 Thread Christian Couder
Hi, On Tue, Jan 6, 2015 at 3:02 AM, Mike Hommey m...@glandium.org wrote: 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 -

Software CM Tool Inquiry

2015-01-06 Thread Campbell, Polly R CTR Maritime EW Sys Div, WXMP
To Whom It May Concern, We are a software support activity for a system that is loaded on a majority of the ships in the navy fleet; I am looking for a CM software tool with the following capabilities to meet our requirements: - Be able to upload unclassified and classified software in a

[ANNOUNCE] Git Universal OS X Installer

2015-01-06 Thread Kyle J. McKay
What is it? --- A universal installer for Git on OS X supporting Mac OS X 10.4.8 or later including PowerPC/Intel and both 32 and 64 bit. Isn't there one already? Yes, there is another OS X installer for Git available. That one, however, did not meet my

Re: [PATCH 2/2] gettext.h: add parentheses around N_ expansion

2015-01-06 Thread Andreas Schwab
Kyle J. McKay mack...@gmail.com writes: Even clang -ansi -pedantic doesn't seem to complain about this. And (a) is just as much a constant expression as a. Are you sure it's not just a tcc bug? The C standard asks for a string literal as the initializer, not an expression. Andreas. --

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

2015-01-06 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: Yeah, I didn't consider the mode impact of using mkstemp. That is definitely a regression that should be fixed. Though of course if you really do want 0644, you should set your umask to 0022. :) ... If you haven't set

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

2015-01-06 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: 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

[PATCH] correct smtp-ssl-cert-path description

2015-01-06 Thread Adam Williamson
The git-send-email documentation was never updated to reflect the change made in 01645b74 to use the SSL library's default CA trust store rather than /etc/ssl/certs as a hardcoded default CApath. This corrects that, and also tweaks the rest of the text a bit to explain more accurately what is

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

2015-01-06 Thread Stefan Beller
On Tue, Jan 6, 2015 at 10:57 AM, Junio C Hamano gits...@pobox.com wrote: You said it yourself above, didn't you? While perfecting your branch and while perfecting reroll of your branch. * After doing changes, wait at least 12 hours for second self-review This is certainly once-per-series.

[PATCHv11 02/11] receive-pack.c: die instead of error in case of possible future bug

2015-01-06 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. Also while touching that code we considered that removing the reported refs may be harmful

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

2015-01-06 Thread Jeff King
On Tue, Jan 06, 2015 at 02:08:16AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Yeah, I didn't consider the mode impact of using mkstemp. That is definitely a regression that should be fixed. Though of course if you really do want 0644, you should set your umask to 0022.

Re: [PATCH] imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: According to the cURL documentation for the CURLOPT_USE_SSL option, it is only used with plain text protocols that get upgraded to SSL using the STARTTLS command. The server.use_ssl variable is only set when we are using a protocol that is already

Re: [PATCH 1/2] log.c: fix translation markings

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Fix this by properly separating the two N_ marked strings with a comma ... Sensible. ... and removing the embedded \n andor: that are properly supplied by the parse_options API. Wow. I learn new things or reminded of old things every day.

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Interesting. We discussed this exact thing just before 2.0 in http://thread.gmane.org/gmane.comp.version-control.git/247511/focus=248858 and nobody seems to have

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

2015-01-06 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

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

2015-01-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: +test_expect_success POSIXPERM 'info/refs is readable in unshared repo' ' + rm -f .git/info/refs + test_unconfig core.sharedrepository + umask 002 + git update-server-info + echo -rw-rw-r-- expect + modebits .git/info/refs actual

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

2015-01-06 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: The disadvantage is that I need to have the high quality in a branch before sending it out for review. But I personally find it easier to deal with git branches than with patch files of different versions. Branches do not forget anything once I

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

2015-01-06 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: - int (*fn)(); + int (*fn)(void); This is an independent fix that has already been merged to 'maint', but to any topic that forked before the merge happened I need to apply the fix without committing it when I test it in isolation, and I

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

2015-01-06 Thread Jeff King
On Tue, Jan 06, 2015 at 10:47:01AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: +test_expect_success POSIXPERM 'info/refs is readable in unshared repo' ' + rm -f .git/info/refs + test_unconfig core.sharedrepository + umask 002 + git update-server-info +

Re: [PATCHv11 02/11] receive-pack.c: die instead of error in case of possible future bug

2015-01-06 Thread Jonathan Nieder
Stefan Beller wrote: +++ b/builtin/receive-pack.c @@ -1061,9 +1061,8 @@ static void warn_if_skipped_connectivity_check(struct command *commands, } } if (!checked_connectivity) - error(BUG: run 'git fsck' for safety.\n - If there are

Re: [PATCH] imap-send.c: support GIT_CURL_VERBOSE

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: When using git-imap-send to send via cURL, support setting the GIT_CURL_VERBOSE environment variable to enable cURL's verbose mode. ... diff --git a/imap-send.c b/imap-send.c index 4dfe4c25..060df834 100644 --- a/imap-send.c +++ b/imap-send.c @@

[PATCH v2 1/2] use 'test ...' instead of '[ ... ]'

2015-01-06 Thread Richard Hansen
(see Documentation/CodingGuidelines) Signed-off-by: Richard Hansen rhan...@bbn.com --- t/test-lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 9acdc88..3670eed 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -184,10 +184,10 @@

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

2015-01-06 Thread Richard Hansen
On 2015-01-06T11:06-08:00, Junio C Hamano wrote: +unset color while test $# -ne 0 do case $1 in @@ -258,40 +250,6 @@ then verbose=t fi -if test -n $color ... @@ -857,6 +815,52 @@ HOME=$TRASH_DIRECTORY GNUPGHOME=$HOME/gnupg-home-not-used export HOME GNUPGHOME +#

Re: [PATCH 3/3] git-checkout.txt: a note about multiple checkout support for submodules

2015-01-06 Thread Max Kirillov
On Sat, Jan 03, 2015 at 04:41:27PM +0700, Nguyễn Thái Ngọc Duy wrote: The goal seems to be using multiple checkouts to reduce disk space. But we have not reached an agreement how things should be. There are a couple options. - You may want to keep $SUB repos elsewhere (perhaps in a central

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 10:25, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: So despite the name of the test, the actual tree contents do not seem to be examined. Yes, but the thing is, thanks to refs/notes restriction, there is no need to do such examination [*1*]. Note that it

Re: [PATCH v4] git-prompt.sh: Option to hide prompt for ignored pwd

2015-01-06 Thread Junio C Hamano
Richard Hansen rhan...@bbn.com writes: This is the patch from: http://article.gmane.org/gmane.comp.version-control.git/258313 modified to include the changes I suggested in: http://article.gmane.org/gmane.comp.version-control.git/258355 I never heard back regarding my suggested

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

2015-01-06 Thread Junio C Hamano
Raphael Kubo da Costa raphael.kubo.da.co...@intel.com writes: 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().

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Junio C Hamano
^Kyle J. McKay mack...@gmail.com writes: greater. But Jens mentions this in $gmane/249491 (that the original patch was missing the = 0 part). Ah, that is what I missed. Thanks. I can't find anything in that thread about why vsatisfies was preferred over vcompare other than the obvious

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: A whitelist solves issue (1) but is no help for issue (2) unless some additional additional part of the refs namespace were to be also whitelisted. Perhaps something like refs/x-anything/... in the same vein as the various IETF standards for

Tab completion missing for --includes and branch description in git config

2015-01-06 Thread Michael Paquier
Hi all, While toying with the tab completion script for bash, I found a couple of things missing that cannot be completed: - git config --includes - git config branch.$BRANCH_NAME.description Attached are trivial patches based on master to fix those things. Regards, -- Michael From

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Johan Herland
On Wed, Jan 7, 2015 at 12:29 AM, Kyle J. McKay mack...@gmail.com wrote: On Jan 6, 2015, at 10:25, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: So despite the name of the test, the actual tree contents do not seem to be examined. Yes, but the thing is, thanks to refs/notes

What's cooking in git.git (Jan 2015, #01; Tue, 6)

2015-01-06 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A (somewhat belated) happy new year, everybody. Sorry for being silent for a few more days than I intended to. I'll try to get sick and

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

2015-01-06 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: 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

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

2015-01-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Jan 06, 2015 at 10:47:01AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: +test_expect_success POSIXPERM 'info/refs is readable in unshared repo' ' + rm -f .git/info/refs + test_unconfig core.sharedrepository + umask 002 +

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 11:42, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: Tcl 8.5 introduced an extended vsatisfies syntax that is not supported by Tcl 8.4. Interesting. We discussed this exact thing just before 2.0 in

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

2015-01-06 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: So before we drift into more discussion, I'd still think it makes sense to have the ***BLURB *** replaced by some configurable questions regarding the series as a whole, so I'd try to perfect that patch? So far, it is only you and me talking about

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

2015-01-06 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: profile-fast is failing in my Git 2.2.1 build from tar in a Git repo

2015-01-06 Thread Junio C Hamano
Paul Smith p...@mad-scientist.net writes: Is anyone aware of this? It seems that profile-fast fails when invoked from a downloaded tarball, if you are in a Git repository when you unpack it. Not me (I don't do profile build), but I am not surprised. The problem is in the

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

2015-01-06 Thread Jeff King
On Tue, Jan 06, 2015 at 01:43:33PM -0800, Junio C Hamano wrote: That is definitely not what the series means to accomplish. I think naming the test info/refs respects umask in unshared repo is probably a better title for the test. Thanks for sanity-checking me (I am still somewhat

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 16:28, Johan Herland wrote: On Wed, Jan 7, 2015 at 12:29 AM, Kyle J. McKay mack...@gmail.com wrote: Perhaps that is the crux of the issue. There is no git notes- plumbing command where the git notes command continues to apply restrictions but the vaporware notes-plumbing

[PATCH v5 0/2] git-prompt.sh: Option to hide prompt for ignored pwd

2015-01-06 Thread Richard Hansen
On 2015-01-06T15:31-08:00, Junio C Hamano wrote: This is the patch from: http://article.gmane.org/gmane.comp.version-control.git/258313 modified to include the changes I suggested in: http://article.gmane.org/gmane.comp.version-control.git/258355 I never heard back regarding my

[PATCH v5 1/2] git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

2015-01-06 Thread Richard Hansen
At the beginning of __git_ps1, right after determining that the function is running in pc mode, set PS1 to a plain (undecorated) prompt. This makes it possible to simply return early without having to set PS1 if the prompt should not be decorated. Signed-off-by: Richard Hansen rhan...@bbn.com

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

2015-01-06 Thread Dan Langille (dalangil)
On Jan 5, 2015, at 6:53 PM, brian m. carlson sand...@crustytoothpaste.net wrote: 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

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

2015-01-06 Thread Dan Langille (dalangil)
On Jan 6, 2015, at 10:31 AM, Dan Langille (dalangil) dalan...@cisco.com wrote: On Jan 5, 2015, at 6:53 PM, brian m. carlson sand...@crustytoothpaste.net wrote: On Mon, Jan 05, 2015 at 09:23:32PM +, Dan Langille (dalangil) wrote: I have tried both patches. Neither succeeds here. I

Re: [PATCH] git-gui.sh: support Tcl 8.4

2015-01-06 Thread Jens Lehmann
Am 07.01.2015 um 01:02 schrieb Junio C Hamano: ^Kyle J. McKay mack...@gmail.com writes: I can't find anything in that thread about why vsatisfies was preferred over vcompare other than the obvious that the vsatisfies version is only a 1-character change. And that would be more than enough

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Johan Herland
(This addresses some smaller specific questions from Kyle, and is not an attempt to take focus away from the main direction of this thread) On Jan 6, 2015 1:27 PM, Kyle J. McKay mack...@gmail.com wrote: On Jan 6, 2015, at 02:20, Junio C Hamano wrote: [...] At the point the dropped line runs,

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Jeff King
On Tue, Jan 06, 2015 at 02:20:33AM -0800, Junio C Hamano wrote: The fact that git notes merge refs/heads/master fails is a very good prevention of end-user mistakes, and this removal of test demonstrates that we are dropping a valuable safety. Is it really that valuable? If it were: git

[PATCH v5 2/2] git-prompt.sh: Option to hide prompt for ignored pwd

2015-01-06 Thread Richard Hansen
From: Jess Austin jess.aus...@gmail.com Optionally set __git_ps1 to display nothing when present working directory is ignored, triggered by the new environmental variable GIT_PS1_HIDE_IF_PWD_IGNORED. This environmental variable may be overridden on any repository by setting bash.hideIfPwdIgnored

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Kyle J. McKay
On Jan 6, 2015, at 15:54, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: A whitelist solves issue (1) but is no help for issue (2) unless some additional additional part of the refs namespace were to be also whitelisted. Perhaps something like refs/x-anything/... in the same

[PATCH 1/2] support for --no-relative and diff.relative

2015-01-06 Thread kelson
added --no-relative option for git-diff (code, documentation, and tests) --no-relative overrides --relative causing a return to standard behavior Signed-off-by: Brandon Phillips kel...@shysecurity.com --- Documentation/diff-options.txt | 4 diff.c | 2 ++

Re: [PATCH v2 2/2] t/t3308-notes-merge.sh: succeed with relaxed notes refs

2015-01-06 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: So despite the name of the test, the actual tree contents do not seem to be examined. Yes, but the thing is, thanks to refs/notes restriction, there is no need to do such examination [*1*]. Note that it is an entirely different matter when you

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

2015-01-06 Thread Dan Langille (dalangil)
On Jan 6, 2015, at 10:31 AM, Dan Langille (dalangil) dalan...@cisco.com wrote: On Jan 5, 2015, at 6:53 PM, brian m. carlson sand...@crustytoothpaste.net wrote: On Mon, Jan 05, 2015 at 09:23:32PM +, Dan Langille (dalangil) wrote: I have tried both patches. Neither succeeds here. I

Re: bearer token authorization with HTTPS transport

2015-01-06 Thread David Renshaw
On Mon, Jan 5, 2015 at 6:41 PM, brian m. carlson sand...@crustytoothpaste.net wrote: For the benefit of someone trying to implement this, libcurl has the CURLOPT_XOAUTH2_BEARER option. It does requires libcurl 7.33, though. As far as I can tell, libcurl supports this option for IMAP, POP, and

[PATCH 2/2] support for --no-relative and diff.relative

2015-01-06 Thread kelson
added diff.relative setting for git-diff (code, documentation, and tests) `git-config diff.relative=true` causes `git diff` to behave like `git diff --relative`. Overridden by `git diff --no-relative`. Signed-off-by: Brandon Phillips kel...@shysecurity.com --- Documentation/diff-config.txt |

Additional plumbing commands

2015-01-06 Thread Charles Rudolph
I am writing some higher level git commands for https://github.com/Originate/git-town and would like some additional plumbing commands that can tell me 1. is there a merge in progress? 2. is there a rebase in progress? 3. is there a cherry-pick in progress? 4. are there unmerged paths? Currently

[PATCH 1/2] gitk: Rearrange window title to be more conventional.

2015-01-06 Thread Marc Branchaud
Signed-off-by: Marc Branchaud marcn...@xiplink.com --- I did a bit of googling but couldn't find some standard that says the application name goes at the end of the title bar. But this is how all the browsers and other apps I use regularly do things. M. gitk | 2 +- 1 file

[RFC PATCH 2/2] gitk: Show the rev(s) the user specified on the command line in the window title.

2015-01-06 Thread Marc Branchaud
Signed-off-by: Marc Branchaud marcn...@xiplink.com --- I often open multiple gitk windows in the same working directory to examine other branches or refs in the repo. This change allows me to distinguish which window is showing what. This is an RFC because it doesn't behave great with views. I

[PATCH 0/2] Tweaking the gitk window title.

2015-01-06 Thread Marc Branchaud
The first patch simply changes the title from gitk: dir to dir - gitk, which is the title layout used by most of the applications on my Kubuntu box. The second patch is the one that I'm more keen to see accepted. It relies on the first only in that it follows the new title layout.

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

2015-01-06 Thread Stefan Beller
On Tue, Jan 6, 2015 at 2:37 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: 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

Re: Question about the revision walking API

2015-01-06 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: I am not sure what you describe above would work, but something like what is done in bisect.c should work, see check_ancestors() and bisect_next_all(). It might not be the most efficient solution though, so I am interested if you find