Problem with environment of hook execution when git is run with --work-tree / --git-dir

2017-11-25 Thread Michael Sloan
Hi! I noticed a potential bug with the invocation of a pre-commit hook when running git with --work-tree and --git-dir. In particular, I was investigating how hooks can still run git commands properly even when the work-tree or git-dir is overridden via CLI args. I put the following in

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-25 Thread Jacob Keller
On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote: > On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote: >> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: > >>> But this line of though might be distracting from your

Re: [PATCH] Makefile: check that tcl/tk is installed

2017-11-25 Thread Junio C Hamano
Christian Couder writes: > On Mon, Nov 20, 2017 at 6:15 PM, Christian Couder > wrote: >> By default running `make install` in the root directory of the >> project will set TCLTK_PATH to `wish` and then go into the "git-gui" >> and

Re: [PATCH] submodule--helper.c: i18n: add a missing space in message

2017-11-25 Thread Junio C Hamano
Thanks.

Re: [PATCH] RelNotes: minor typo fixes in 2.15.1 draft

2017-11-25 Thread Junio C Hamano
Todd Zullinger writes: > It was mildly surprising that the script didn't warn or complain about > an unknown option. After a quick look, that seems to be due to the > Getopt::Long pass_through option which sends unknown options to > format-patch. Heh, that is another reason why

Re: [PATCH v5 1/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Junio C Hamano
Max Kirillov writes: > Author: Florian Manschwetus This should read "From: ..."; > Date: Wed, 30 Mar 2016 09:08:56 + > > http-backend reads whole input until EOF. However, the RFC 3875 specifies > that a script must read only as many bytes

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Junio C Hamano
Thomas Gummerer writes: > Of course that assumes that it's used directly, not in scripts, and > that users will actually read the output of the command when they > invoke it. Maybe these are not safe assumptions to make though, and > we'd rather not have this on by default

Re: git status always modifies index?

2017-11-25 Thread Junio C Hamano
Jeff King writes: > What I was trying to get at is that naming it "status --no-lock-index" > would not be the same thing (even though with the current implementation > it would behave the same). IOW, can we improve the documentation of > "status" to point to make it easier to

Re: [PATCH v4 1/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-25 Thread Junio C Hamano
Junio C Hamano writes: > - 5/6: What we see in [v4 1/6] (except for introduction of the > helper, which already happened in an earlier step). Move > the promise of covering this new output format with a follow > up series to the proposed log message

Re: [PATCH v4 1/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-25 Thread Junio C Hamano
... and this is a sample of the "remainder" of 6/6 outlined in the previous message, to become part of 5/6 to show how the new output would look like in a test form. t/t4013-diff-various.sh| 1 +

Re: [PATCH v4 1/6] diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-25 Thread Junio C Hamano
Junio C Hamano writes: > Thanks for sticking with this topic---very much appreciated, as we > saw many newcomers get tired of doing repeated polishing and abandon > their topic in the past. I have to go offline now, but will comment > later when I come back. Regarding the

[PATCH] pretty: fix buffer over-read with %> and %

2017-11-25 Thread mwnx
A buffer over-read of the format string would occur with unterminated formats of the form '%>(#' and '%<(#', where '#' represents a number. This error can be witnessed by running git log under valgrind like so: valgrind git log -n1 --format='%<(42' This was due to the fact that the "not

Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals

2017-11-25 Thread Junio C Hamano
Elijah Newren writes: > I had another email I had been composing to try to argue for changing > merge-recursive.c's design to the above, assuming I could get the time > to work on it. Nice to see that I'm not crazy, and that I apparently > don't need to do much convincing.

Bug in pathspec handling (in conjunction with submodules)

2017-11-25 Thread Johannes Schindelin
Hi Duy & Brandon, in 74ed43711fd (grep: enable recurse-submodules to work on objects, 2016-12-16), the do_match() function in tree-walk.c was changed so that it can recurse across submodule boundaries. However, there is a bug, and I *think* there may be two bugs actually. Or even three. First

Re: [PATCH] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
On Fri, Nov 24, 2017 at 02:54:50PM +0900, Junio C Hamano wrote: > Max Kirillov writes: >> I hope I marked it correctly in the trailers. > > It is probably more conventional to do it like so: > > From: Florian Manschwetus > Date: > >

[PATCH v4 1/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
http-backend reads whole input until EOF. However, the RFC 3875 specifies that a script must read only as many bytes as specified by CONTENT_LENGTH environment variable. Web server may exercise the specification by not closing the script's standard input after writing content. In that case

[PATCH v5 2/2] t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases

2017-11-25 Thread Max Kirillov
Add tests for cases: * CONTENT_LENGTH is set, script's stdin has more data. (Failure would make it read GIT_HTTP_MAX_REQUEST_BUFFER bytes from /dev/zero and fail. It does not seem to cause any performance issues with the default value of GIT_HTTP_MAX_REQUEST_BUFFER.) * CONTENT_LENGTH is

[PATCH v4 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
* polished style * add tests * marked the authorship more correctly Max Kirillov (2): http-backend: respect CONTENT_LENGTH as specified by rfc3875 t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases Makefile | 1 + config.c | 8

[PATCH v5 1/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
Author: Florian Manschwetus Date: Wed, 30 Mar 2016 09:08:56 + http-backend reads whole input until EOF. However, the RFC 3875 specifies that a script must read only as many bytes as specified by CONTENT_LENGTH environment variable. Web server may exercise the

[PATCH v5 0/2] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
I seem to forgot to put the authorship lines, and also did something with replies, so sending another sequence. v5: * marked the authorship more correctly v4: * polished style * add tests Max Kirillov (2): http-backend: respect CONTENT_LENGTH as specified by rfc3875

[PATCH v4 2/2] t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases

2017-11-25 Thread Max Kirillov
Add tests for cases: * CONTENT_LENGTH is set, script's stdin has more data. (Failure would make it read GIT_HTTP_MAX_REQUEST_BUFFER bytes from /dev/zero and fail. It does not seem to cause any performance issues with the default value of GIT_HTTP_MAX_REQUEST_BUFFER.) * CONTENT_LENGTH is

Re: [PATCH v3 21/33] merge-recursive: add get_directory_renames()

2017-11-25 Thread Elijah Newren
On Sat, Nov 25, 2017 at 4:52 PM, Johannes Schindelin wrote: > On Tue, 21 Nov 2017, Elijah Newren wrote: > >> diff --git a/merge-recursive.c b/merge-recursive.c >> + if (old_len != new_len || strncmp(old_path, new_path, old_len)) { >> + *old_dir =

Re: [PATCH v3 21/33] merge-recursive: add get_directory_renames()

2017-11-25 Thread Johannes Schindelin
Hi Elijah, On Tue, 21 Nov 2017, Elijah Newren wrote: > diff --git a/merge-recursive.c b/merge-recursive.c > index 2f4f85314a..6a0a6d4366 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -1384,6 +1384,132 @@ static struct diff_queue_struct *get_diffpairs(struct > merge_options *o,

Re: [PATCH] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
On Sat, Nov 25, 2017 at 07:38:33PM -0500, Eric Sunshine wrote: > On Sat, Nov 25, 2017 at 4:47 PM, Max Kirillov wrote: >> On Thu, Nov 23, 2017 at 08:30:39PM -0500, Eric Sunshine wrote: +static ssize_t read_request_fix_len(int fd, size_t req_len, unsigned char **out) >>>

Re: [PATCH] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Eric Sunshine
On Sat, Nov 25, 2017 at 4:47 PM, Max Kirillov wrote: > Thanks for the review. I saw only reaction of the Jeff in > the original thread and though that it is ok otherwise. I'm > fixing the things you mentioned. The commentary (in which you talked about restoring the patch and

Re: [PATCH] submodule--helper.c: i18n: add a missing space in message

2017-11-25 Thread Eric Sunshine
On Sat, Nov 25, 2017 at 2:55 PM, Jean-Noel Avila wrote: > The message spans over 2 lines but the C conconcatenation does not add s/conconcatenation/concatenation/ > the needed space between the two lines. > > Signed-off-by: Jean-Noel Avila > --- > diff --git

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Paul Smith
On Sat, 2017-11-25 at 20:06 +, Thomas Gummerer wrote: > This part is getting done in 3/4, and is definitely going to work > without an additional flag, so this is (hopefully) soon going to work > just as you want :) Yay! Thanks!

Re: Clone repository computer A to remote B doenst work

2017-11-25 Thread Johannes Schindelin
Hi Roberto, On Sat, 25 Nov 2017, Roberto Garcia wrote: > I'm trying clone in windows a git repository to other remote machine > (NAS Linux based). > I have installed git for windows but i didn't installed nothing in the > other remote machine (NAS Linux based). You need a Git on the remote

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

2017-11-25 Thread Elijah Newren
On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote: > On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: >> But this line of though might be distracting from your original point, >> which was that we have so much to keep in mind when doing tree

Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals

2017-11-25 Thread Elijah Newren
On Fri, Nov 24, 2017 at 7:29 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> But what it really is forced to do is more of a 4-way merge; a good >> chunk of its annoying complexity is based around this (undocumented >> and unfortunate)

Re: Problem installing Git

2017-11-25 Thread Johannes Schindelin
Hi Igor, On Thu, 23 Nov 2017, Igor Djordjevic wrote: > [ +Cc: Git for Windows mailing list ] I have no idea why it claimed that that group does not exist, the email address looks correct to me. > On 23/11/2017 19:51, Phil Martel wrote: > > I'm trying to install Git-2.15.0-64-bit.exe onto my

Re: git status always modifies index?

2017-11-25 Thread Johannes Schindelin
Hi Peff, On Wed, 22 Nov 2017, Jeff King wrote: > On Wed, Nov 22, 2017 at 01:56:35PM -0800, Jonathan Nieder wrote: > > > Jeff King wrote: > > > On Wed, Nov 22, 2017 at 12:27:20PM -0800, Jonathan Nieder wrote: > > > > >> That said, I wonder if this use case is an illustration that a name > > >>

Re: [PATCH] http-backend: respect CONTENT_LENGTH as specified by rfc3875

2017-11-25 Thread Max Kirillov
Thanks for the review. I saw only reaction of the Jeff in the original thread and though that it is ok otherwise. I'm fixing the things you mentioned. On Thu, Nov 23, 2017 at 08:30:39PM -0500, Eric Sunshine wrote: >> +static ssize_t read_request_fix_len(int fd, size_t req_len, unsigned char >>

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Thomas Gummerer
On 11/25, Randall S. Becker wrote: > On November 25, 2017 3:06 PM Thomas Gummerer wrote: > > >however we currently document one behaviour, which I would like to change > >(I usually have branches > >without a / in that I want to look at) we currently document one behaviour, > >which I'd like to

Re: [PATCH] Makefile: check that tcl/tk is installed

2017-11-25 Thread Christian Couder
On Mon, Nov 20, 2017 at 6:15 PM, Christian Couder wrote: > By default running `make install` in the root directory of the > project will set TCLTK_PATH to `wish` and then go into the "git-gui" > and "gitk-git" sub-directories to build and install these 2 >

RE: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Randall S. Becker
On November 25, 2017 3:06 PM Thomas Gummerer wrote: >however we currently document one behaviour, which I would like to change (I usually have branches >without a / in that I want to look at) we currently document one behaviour, which I'd like to change. So >in that case we are a bit worried

git-p4: cloning with a change number does not import all files

2017-11-25 Thread Patrick Rouleau
Hi, I created a git repository with these commands: git p4 clone //perforce/path@123456 repo cd repo git p4 rebase Some files created before the change 123456 do not exist in git history. I do see why, but those files were not modified after that change number. If I use "git p4 sync

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Thomas Gummerer
On 11/25, Paul Smith wrote: > On Sat, 2017-11-25 at 17:50 +, Thomas Gummerer wrote: > > This would be the output in the new version: > > > > $ git worktree add ../bla > > Branch 'bla' set up to track remote branch 'bla' from 'origin'. > > Preparing ../bla (identifier bla) > >

[PATCH] submodule--helper.c: i18n: add a missing space in message

2017-11-25 Thread Jean-Noel Avila
The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. Signed-off-by: Jean-Noel Avila --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--helper.c

[PATCH] submodule--helper.c: i18n: add a missing space in message

2017-11-25 Thread Jean-Noel Avila
The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 2086f0eb0..a5c4a8a69

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Paul Smith
On Sat, 2017-11-25 at 17:50 +, Thomas Gummerer wrote: > This would be the output in the new version: > > $ git worktree add ../bla > Branch 'bla' set up to track remote branch 'bla' from 'origin'. > Preparing ../bla (identifier bla) > HEAD is now at 4aade43 bla > > vs.

Re: [PATCH] RelNotes: minor typo fixes in 2.15.1 draft

2017-11-25 Thread Todd Zullinger
Apologies for the duplicate. I used the `-n` option, mistakenly thinking it was a synonym for `--dry-run` and didn't pay enough attention to see that it sent. (The only indication is s/OK./Dry &/ which I missed.) It was mildly surprising that the script didn't warn or complain about an

Re: [PATCH v4 4/4] worktree: make add dwim

2017-11-25 Thread Thomas Gummerer
On 11/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Currently 'git worktree add ' creates a new branch named after the > > basename of the , that matches the HEAD of whichever worktree we > > were on when calling "git worktree add ". > > > > Make 'git worktree

[PATCH] RelNotes: minor typo fixes in 2.15.1 draft

2017-11-25 Thread Todd Zullinger
Signed-off-by: Todd Zullinger --- Documentation/RelNotes/2.15.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt index 47f23b56fe..81dd64b4ad 100644 ---

[PATCH] RelNotes: minor typo fixes in 2.15.1 draft

2017-11-25 Thread Todd Zullinger
Signed-off-by: Todd Zullinger --- Documentation/RelNotes/2.15.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt index 47f23b56fe..81dd64b4ad 100644 ---

Re: [PATCH v4 2/4] worktree: add --[no-]track option to the add subcommand

2017-11-25 Thread Thomas Gummerer
On 11/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh > > index b5c47ac602..53042ce565 100755 > > --- a/t/t2025-worktree-add.sh > > +++ b/t/t2025-worktree-add.sh > > @@ -313,5 +313,60 @@

RE: Clone repository computer A to remote B doenst work

2017-11-25 Thread Randall S. Becker
On November 25, 2017 4:31 AM Roberto Garcia wrote: >I'm trying clone in windows a git repository to other remote machine (NAS >Linux based). >I have installed git for windows but i didn't installed nothing in the other >remote machine (NAS Linux based). You have two choices: 1. Install git on

Xmas Loan Bonaza

2017-11-25 Thread Shell Federal Credit Union
Are You In Need Of A Private Or Business Loans At 2% Rate For Various Purposes? If Yes; Contact us with this info below. Full Name: Amount Needed: Duration: Country Cell No:

Re: [PATCH] checkout: include the checkout.h header file

2017-11-25 Thread Thomas Gummerer
On 11/24, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Thomas, > > If you need to re-roll your 'tg/worktree-create-tracking' branch, could > you please squash this into the relevant patch (commit 6736ae9593, > "checkout: factor out functions to

Clone repository computer A to remote B doenst work

2017-11-25 Thread Roberto Garcia
Hello all, I'm trying clone in windows a git repository to other remote machine (NAS Linux based). I have installed git for windows but i didn't installed nothing in the other remote machine (NAS Linux based). I open git-bash and I try do this: "git clone user@IP:/directory/where/i/want/clone".

HOPETO HEAR FROM YOU

2017-11-25 Thread Miss Fatima
Hello dear how are you? Nice to meet you,my name is Miss Fatima, can we become friends? hope to hear from you so that we can know each other very well,love matters mostly in life,i will also send you my pictures and tell you more about myself, my email address is, fatima.ab...@yahoo.com waiting