What happen if show_http_message fails to reencode?

2015-04-19 Thread Yi, EungJun
I'm trying to make my git server sends http messages in non-ASCII encoding. And I have a question. At 206-218 in remote-curl.c: > static int show_http_message(struct strbuf *type, struct strbuf *charset, > struct strbuf *msg) > { > const char *p, *eol; > > /* > * We

Re: Why does "git log --author=" not work with "regexp-ignore-case" and other regexp-related options?

2015-04-19 Thread Junio C Hamano
Tim Friske writes: > I wonder why "git log --author=" does not work with the > "regexp-ignore-case" option and the other regexp-related options > Wouldn't it be useful to make ... I think the reason is because nobody bothered to make it so. That does not necessarily say what you suggest is not

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-19 Thread Duy Nguyen
On Mon, Apr 20, 2015 at 12:37 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> But if you look at it another way, "cd subrepo; git add ." should be >> the same as "git add subrepo" ... > > Once you cd into "subrepo", you are in a different world, a world > different from the toplevel project.

Re: [PATCH V2 1/2] t9801: check git-p4's branch detection and client view together

2015-04-19 Thread Junio C Hamano
Vitor Antunes writes: > Add failing scenario where branch detection is enabled together with > use client view. In this specific scenario git-p4 will break when the > perforce client view removes part of the depot path. I somehow cannot parse "together with use client view", especially the word

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-19 Thread Junio C Hamano
Duy Nguyen writes: > But if you look at it another way, "cd subrepo; git add ." should be > the same as "git add subrepo" ... Once you cd into "subrepo", you are in a different world, a world different from the toplevel project. "git add ." over there should mean "add everything in subproject's

Re: [PATCH] git-p4: Improve client path detection when branches are used

2015-04-19 Thread Junio C Hamano
Vitor Antunes writes: > Hope I got everything right this time :) > > Thanks for your help, Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v8 2/4] cat-file: teach cat-file a '--literally' option

2015-04-19 Thread Junio C Hamano
Charles Bailey writes: > I'm sorry to come in with such a fundamental question at such a late > revision of this patch series, but am I the only person to wonder about > the choice of option name? > > To me, cat-file already output objects "literally" (without -p) as > opposed to show. From the d

Re: [PATCH v3] config.c: split some variables to $GIT_DIR/config.worktree

2015-04-19 Thread Duy Nguyen
On Mon, Apr 20, 2015 at 9:51 AM, Max Kirillov wrote: > By the way, if checkout --to run on repository created > before the feaure added, the linked checkout will not be > able to use own variables. Should checkout --to check that > the file exists and create it in case it does not? Yes it should.

Re: [PATCH v3] config.c: split some variables to $GIT_DIR/config.worktree

2015-04-19 Thread Max Kirillov
On Sat, Apr 18, 2015 at 06:10:23PM +0700, Duy Nguyen wrote: > On Tue, Apr 14, 2015 at 02:37:39AM +0300, Max Kirillov wrote: > > On Tue, Mar 31, 2015 at 07:14:39PM +0700, Nguyễn Thái Ngọc Duy wrote: > > > core.worktree and core.bare, which are treated specially in 31e26eb [1], > > > are now moved to

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-19 Thread Duy Nguyen
On Sun, Apr 19, 2015 at 7:53 PM, Jens Lehmann wrote: > And me thinks it should error out. We already do that when trying > to add a specific file from above the gitlink: > >$ git add subrepo/a >fatal: Pathspec 'subrepo/a' is in submodule 'subrepo' > > And from below the gitlink: > >$ c

Re: [PATCH v2 1/7] path.c: implement xdg_config_home()

2015-04-19 Thread Eric Sunshine
On Sat, Apr 18, 2015 at 3:51 AM, Paul Tan wrote: > On Fri, Apr 17, 2015 at 5:41 AM, Eric Sunshine > wrote: >> On Tue, Apr 14, 2015 at 1:28 PM, Paul Tan wrote: >>> + * Returns the newly allocated string "$XDG_CONFIG_HOME/git/{filename}". >>> If >>> + * $XDG_CONFIG_HOME is unset or empty, retur

Re: [BUG] "git pull" will regress between 'master' and 'pu'

2015-04-19 Thread Jeff King
On Sun, Apr 19, 2015 at 05:38:26PM +, brian m. carlson wrote: > > eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args > > $verbosity" > > @@ -334,7 +333,7 @@ true) > > eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash > > $no_ff $ff_only" > > ev

Re: [BUG] "git pull" will regress between 'master' and 'pu'

2015-04-19 Thread brian m. carlson
On Sun, Apr 19, 2015 at 09:07:46AM -0400, Jeff King wrote: > Which I guess is just: > > diff --git a/git-pull.sh b/git-pull.sh > index 252969e..15d9431 100755 > --- a/git-pull.sh > +++ b/git-pull.sh > @@ -323,7 +323,6 @@ then > fi > fi > > -merge_name=$(git fmt-merge-msg $log_arg <"$GIT_D

[PATCH] Documentation: change -L: to -L:

2015-04-19 Thread Matthieu Moy
The old wording was somehow implying that and were not regular expressions. Also, the common case is to use a plain function name here so makes sense (the fact that it is a regular expression is documented in line-range-format.txt). Signed-off-by: Matthieu Moy --- Junio C Hamano writes: > By

Re: git-archive ignores submodules

2015-04-19 Thread Kevin Daudt
On Thu, Apr 16, 2015 at 09:03:10PM +0200, Jens Lehmann wrote: > Am 16.04.2015 um 20:09 schrieb Pedro Rodrigues: > > If people are interested I could try to polish it and resubmit it. > It would be great if Pedro could test that it does what he expects. I'm certainly interested. -- To unsubscribe

Re: [BUG] "git pull" will regress between 'master' and 'pu'

2015-04-19 Thread Jeff King
On Sat, Apr 18, 2015 at 06:39:20PM -0700, Junio C Hamano wrote: > This is primarily note-to-self; even though I haven't got around > bisecting yet, I think I know I did some bad change myself. > > "git pull $URL $tag" seems to: > > * fail to invoke the editor without "--edit". > * show the sum

Re: [PATCH] pathspec: adjust prefixlen after striping trailing slash

2015-04-19 Thread Jens Lehmann
Am 18.04.2015 um 03:19 schrieb Nguyễn Thái Ngọc Duy: A path(spec) from git perspective consists of two parts, the prefix, and the rest. The prefix covers the part of `pwd` after expanding ".." components. The split is to support case-insensitive match in a sane way (see 93d9353, especially the bi

Re: [PATCH] git-p4: Improve client path detection when branches are used

2015-04-19 Thread Vitor Antunes
Junio C Hamano wrote on Sat, 18 Apr 2015 17:58:11 -0700 > Vitor Antunes writes: > >> This patch makes the client path detection more robust by limiting the valid >> results from p4 where. The test case is also made more complex, to guarantee >> that such client views are supported. >> >> Signed-o

[PATCH V2 0/2] git-p4: improve client path detection with branches used

2015-04-19 Thread Vitor Antunes
Robustness improvement in regards to previous patches, both in the test case and git-p4 functionality. 1. Test case now includes a mapped sub-file, to guarantee that git-p4 copes with such client view. 2. git-p4 now searches for paths starting with the branch's depot path and ending with "/

[PATCH V2 1/2] t9801: check git-p4's branch detection and client view together

2015-04-19 Thread Vitor Antunes
Add failing scenario where branch detection is enabled together with use client view. In this specific scenario git-p4 will break when the perforce client view removes part of the depot path. The test case also includes an extra sub-file mapping to enforce robustness check on git-p4 implementation

[PATCH V2 2/2] git-p4: improve client path detection when branches are used

2015-04-19 Thread Vitor Antunes
A client view can be used to remap folder locations in the workspace. To support this when branch detection is enabled, it is necessary to get the client path through "p4 where". This patch does two things to achieve this: 1. Force usage of "p4 where" when P4 branches exist in the git reposi

Re: REQUEST-PULL: Please pull from git-gui.

2015-04-19 Thread Krzysztof Kolasa
On 18.04.2015 15:47, Pat Thoyts wrote: > The following changes since commit 1b2c79e63e5afa3cecb3ab4a40cb414dbe6511ce: > > Michael Lutz (1): > git-gui: add configurable tab size to the diff view > thanks a lot after 3 years :) never again dirty git :) Krzysztof smime.p7s Description:

Why does "git log --author=" not work with "regexp-ignore-case" and other regexp-related options?

2015-04-19 Thread Tim Friske
Hi, I wonder why "git log --author=" does not work with the "regexp-ignore-case" option and the other regexp-related options? Wouldn't it be useful to make the "author=" option support the following options? * basic-regexp * extended-regexp * fixed-strings * perl-regexp In the same way "