git describe unexpected results

2015-12-21 Thread Tarmigan
In a private repository, I have set of tags which are mostly linear (each tag contains the previous one). I have created this repo with fast-export --anonomize to reproduce the issue and it is available at https://github.com/tarm/git_describe_repo. Recently I ran git describe, but I did not get th

Re: [PATCH v2 0/2] do_compare_entry: use already-computed path

2015-12-21 Thread David Turner
On Mon, 2015-12-21 at 15:34 -0800, Junio C Hamano wrote: > Great. Thanks, will queue w/o 1/2 (though I do not think it would > hurt). > > On Mon, Dec 21, 2015 at 3:33 PM, David Turner < > dtur...@twopensource.com> wrote: > > On Mon, 2015-12-21 at 15:27 -0800, Junio C Hamano wrote: > > > Thanks. D

Re: [PATCH 2/2] Add a section to the users manual documenting shallow clones.

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 9:09 PM, Stephen P. Smith wrote: > Add a section to the users manual documenting shallow clones. For the subject, prefix by section/module you're touching; drop capitalization; drop full-stop (period). > The todo section previously noted that documentation of shallow clon

Re: [PATCH 1/2] Define the term shallow clone.

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 9:09 PM, Stephen P. Smith wrote: > There are several places in the documentation that > the term shallow clone is used. Defining the term > enables its use elsewhere with a known definition. > > Signed-off-by: Stephen P. Smith > --- > diff --git a/Documentation/glossary-co

[PATCH 1/2] Define the term shallow clone.

2015-12-21 Thread Stephen P. Smith
There are several places in the documentation that the term shallow clone is used. Defining the term enables its use elsewhere with a known definition. Signed-off-by: Stephen P. Smith --- Documentation/glossary-content.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/glo

[PATCH 2/2] Add a section to the users manual documenting shallow clones.

2015-12-21 Thread Stephen P. Smith
The todo section previously noted that documentation of shallow clones was not in the manual and had references to the 1.5.0 release notes. The patch adds a section to the manual and removes the entry in the ToDo list. Signed-off-by: Stephen P. Smith --- Notes: I considered adding a paragra

Re: [PATCH] Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"

2015-12-21 Thread Duy Nguyen
On Tue, Dec 22, 2015 at 1:31 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Nguyễn Thái Ngọc Duy writes: >> >>> This commit has caused three regression reports so far. All of them are >>> about spawning git subprocesses, where the new presence of GIT_WORK_TREE >>> either changes comman

Re: [PATCH 4/4] create_symref: use existing ref-lock code

2015-12-21 Thread Jeff King
On Mon, Dec 21, 2015 at 12:50:28PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > #ifndef NO_SYMLINK_HEAD > > - if (prefer_symlink_refs) { > > - unlink(ref_path); > > - if (!symlink(target, ref_path)) > > - goto done; > > I see that the original

Re: [PATCH v2 0/2] do_compare_entry: use already-computed path

2015-12-21 Thread David Turner
On Mon, 2015-12-21 at 15:27 -0800, Junio C Hamano wrote: > Thanks. Does the number still stay at 25% improvement? Yes. -- 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-i

Re: [PATCH v2 0/2] do_compare_entry: use already-computed path

2015-12-21 Thread Junio C Hamano
Thanks. Does the number still stay at 25% improvement? -- 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 v2 1/2] traverse_info: make mostly const

2015-12-21 Thread David Turner
On Mon, 2015-12-21 at 17:34 -0500, David Turner wrote: > We don't usually modify traverse_info, so make it const across a wide > range of functions. > > Signed-off-by: David Turner > --- > builtin/merge-tree.c | 2 +- > cache-tree.c | 4 ++-- > cache-tree.h | 2 +-

[PATCH v2 1/2] traverse_info: make mostly const

2015-12-21 Thread David Turner
We don't usually modify traverse_info, so make it const across a wide range of functions. Signed-off-by: David Turner --- builtin/merge-tree.c | 2 +- cache-tree.c | 4 ++-- cache-tree.h | 2 +- t/t4010-diff-pathspec.sh | 2 +- tree-walk.c | 2 +- tr

[PATCH v2 2/2] do_compare_entry: use already-computed path

2015-12-21 Thread David Turner
In traverse_trees, we generate the complete traverse path for a traverse_info. Later, in do_compare_entry, we used to go do a bunch of work to compare the traverse_info to a cache_entry's name without computing that path. But since we already have that path, we don't need to do all that work. In

[PATCH v2 0/2] do_compare_entry: use already-computed path

2015-12-21 Thread David Turner
This version strdups the path to avoid it getting mutated. Problem noted by Junio. David Turner (2): traverse_info: make mostly const do_compare_entry: use already-computed path builtin/merge-tree.c | 2 +- cache-tree.c | 4 ++-- cache-tree.h | 2 +- t/t4010-

Re: [PATCH v2 0/3] nd/clear-gitenv-upon-use-of-alias

2015-12-21 Thread Junio C Hamano
Thanks. I wiggled these three on top of the "Revert the earlier one"; while I think the result is correct, I'd appreciate if you can double check the result when I push the topic out later today. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord.

Re: "git stash pop" is doing an unwanted "git add" when there are conflicts.

2015-12-21 Thread Alan Mackenzie
Alan Mackenzie wrote: on Mon, 21 Dec 2015 14:29:54 > Hello, git project. > Last night, whilst clearing out a stale "stash stack", I did "git stash > pop". There were conflicts in two files. > However, all the popped files became staged. This doesn't normally happen. > It was intensely irritati

Re: [PATCH 4/4] create_symref: use existing ref-lock code

2015-12-21 Thread Junio C Hamano
Jeff King writes: > #ifndef NO_SYMLINK_HEAD > - if (prefer_symlink_refs) { > - unlink(ref_path); > - if (!symlink(target, ref_path)) > - goto done; I see that the original was sloppy (most certainly my bad) ... > + char *ref_path = get_locked

Re: [PATCH v1 2/2] git-p4: suppress non test relevant output

2015-12-21 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > If tests are executed in verbose mode then the retry logic clutters the > test output. Suppress that clutter. > > Signed-off-by: Lars Schneider > --- > t/lib-git-p4.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --

Re: [PATCH v1 0/2] git-p4: kill watchdog and suppress irrelevant output

2015-12-21 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Hi, > > these patches extend "git-p4: add trap to kill p4d on test exit" (dfe90e8) > and therefore should be applied on master. Wait, wait. Please be a bit more careful when you use such a phrasing. Did somebody review these and said

Re: [git-for-windows] Case insensitive branch names

2015-12-21 Thread Philip Oakley
From: "Torsten Bögershausen" On 2015-12-21 18.37, Junio C Hamano wrote: Duy Nguyen writes: On Mon, Dec 21, 2015 at 6:01 PM, Philip Oakley wrote: On the Git User's list, Diego J. reported that: 'When I "checkout" a branch using different Upper Case/Lower Case than the original, the bran

Re: Someplace to contribute: documentation

2015-12-21 Thread Eric Sunshine
On Mon, Dec 21, 2015 at 2:55 PM, Stephen & Linda Smith wrote: > On Sunday, December 20, 2015 06:27:56 PM Stephen & Linda Smith wrote: >> I've been looking over the git source tree to see if there is some place >> where I can >> contribute. It appears that there are some suggestions at the botto

Re: Someplace to contribute: documentation

2015-12-21 Thread Stephen & Linda Smith
On Sunday, December 20, 2015 06:27:56 PM Stephen & Linda Smith wrote: > I've been looking over the git source tree to see if there is some place > where I can > contribute. It appears that there are some suggestions at the bottom of > the userguide. Does anyone have other places that they wou

Re: [PATCH] hooks/update: Add a hooks.denyunsignedtags option

2015-12-21 Thread Eric Sunshine
On Monday, December 21, 2015, Julian Andres Klode wrote: > Introduce an option to deny unsigned tags from entering > a repository. This is useful in teams where members forget > to sign their release tags. > > It does not actually check whether the signature is actually > complete or valid, it jus

Re: [PATCHv2 0/3] git-p4: fixing p4ChangesForPaths

2015-12-21 Thread Junio C Hamano
Thanks, will replace what was queued on 'pu'. -- 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] hooks/update: Add a hooks.denyunsignedtags option

2015-12-21 Thread Junio C Hamano
Junio C Hamano writes: > Use of "cat-file -p" is a bad manner in scripts, as we reserve the > right to change what "-p" output looks like purely on human > usability. "cat-file tag", perhaps? > > Also, > > $ git grep ' PGP ' > > in our source tells me that we use a bit tighter pattern even

Re: [PATCH] Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"

2015-12-21 Thread Junio C Hamano
Junio C Hamano writes: > Nguyễn Thái Ngọc Duy writes: > >> This commit has caused three regression reports so far. All of them are >> about spawning git subprocesses, where the new presence of GIT_WORK_TREE >> either changes command behaviour (git-init or git-clone), or how >> repo/worktree is

Re: [PATCH 7/8] config: add core.untrackedCache

2015-12-21 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Dec 17, 2015 at 2:44 PM, Jeff King wrote: >> I think we may actually be thinking of the same thing. Naively, I would >> expect: >> >> .. >> - if there is cache data in the index but that config flag is not set, >> presumably we would not update it (we could eve

Re: [git-for-windows] Case insensitive branch names

2015-12-21 Thread Torsten Bögershausen
On 2015-12-21 18.37, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Mon, Dec 21, 2015 at 6:01 PM, Philip Oakley wrote: >>> On the Git User's list, Diego J. reported that: >>> >>> 'When I "checkout" a branch using different Upper Case/Lower Case than the >>> original, the branch doesn't show

Re: [PATCH] hooks/update: Add a hooks.denyunsignedtags option

2015-12-21 Thread Junio C Hamano
Julian Andres Klode writes: > Introduce an option to deny unsigned tags from entering > a repository. This is useful in teams where members forget > to sign their release tags. > > It does not actually check whether the signature is actually > complete or valid, it just checks for the beginning o

Re: [git-for-windows] Case insensitive branch names

2015-12-21 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Dec 21, 2015 at 6:01 PM, Philip Oakley wrote: >> On the Git User's list, Diego J. reported that: >> >> 'When I "checkout" a branch using different Upper Case/Lower Case than the >> original, the branch doesn't show in "git branch [--list]"' [1] >> >> While case sensi

[PATCH] hooks/update: Add a hooks.denyunsignedtags option

2015-12-21 Thread Julian Andres Klode
Introduce an option to deny unsigned tags from entering a repository. This is useful in teams where members forget to sign their release tags. It does not actually check whether the signature is actually complete or valid, it just checks for the beginning of a signature, as further checks would be

Re: [PATCH] Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"

2015-12-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This commit has caused three regression reports so far. All of them are > about spawning git subprocesses, where the new presence of GIT_WORK_TREE > either changes command behaviour (git-init or git-clone), or how > repo/worktree is detected (from aliases), with or

Re: [PATCH] commit: ensure correct permissions of the commit message

2015-12-21 Thread Junio C Hamano
Jeff King writes: > On Sun, Dec 20, 2015 at 05:31:48PM -0800, Junio C Hamano wrote: > >> Actually, we do not even _need_ a sharedness for this ephemeral >> file. The additional "adjust-shared-perm" is merely a workaround >> for the fact the next person cannot write into it when it is left >> beh

Applying attached patches with git-am fails due to leading > in patch

2015-12-21 Thread Julian Andres Klode
Hi everyone, when I get an email with a patch attached, instead of inline, and save the attachment; the first line "From ..." has a ">" in front of it, which causes git-am to not recognize the patch format. Would it be possible to just ignore the > on that line and then read the patch correctly?

Re: [PATCH] do_compare_entry: use already-computed path

2015-12-21 Thread Junio C Hamano
David Turner writes: > In traverse_trees, we generate the complete traverse path for a > traverse_info. Later, in do_compare_entry, we used to go do a bunch > of work to compare the traverse_info to a cache_entry's name without > computing that path. But since we already have that path, we don'

Re: [PATCH v2] mingw: emulate write(2) that fails with a EPIPE

2015-12-21 Thread Junio C Hamano
Johannes Sixt writes: >> +#undef write >> +ssize_t mingw_write(int fd, const void *buf, size_t len) >> +{ >> +ssize_t result = write(fd, buf, len); >> + >> +if (result < 0 && errno == EINVAL && buf) { >> +/* check if fd is a pipe */ >> +HANDLE h = (HANDLE) _get_osf

Re: [RFPR] updates for 2.7?

2015-12-21 Thread Junio C Hamano
Paul Mackerras writes: > On Tue, Dec 15, 2015 at 03:09:44PM -0800, Junio C Hamano wrote: >> Git 2.7-rc1 has just been tagged, and the remainder of the year will >> be for the stabilization, fixes to brown-paper-bag bugs, reverts of >> regressions, etc., but I haven't seen updates to the various >

Re: What's cooking in git.git (Dec 2015, #05; Tue, 15)

2015-12-21 Thread Junio C Hamano
SZEDER Gábor writes: >> On the other hand, I've marked a handful of topics below as "Will >> discard". They were all dormant after waiting for updates for quite >> a long time; interested people may want to help resurrect them. > >> * sg/pretty-more-date-mode-format (2015-10-07) 1 commit >> - pr

Re: What's cooking in git.git (Dec 2015, #05; Tue, 15)

2015-12-21 Thread Torsten Bögershausen
On 2015-12-16 19.04, Junio C Hamano wrote: > Thanks. In the meantime, I'll pick up v6 $gmane/282061 and replace > the above with it. I'm looking for a replacement for the grep/sed combination, but no luck with different trial. Can anybody help me out, please ? git ls-files --eol -o | grep "TeBi_"

"git stash pop" is doing an unwanted "git add" when there are conflicts.

2015-12-21 Thread Alan Mackenzie
Hello, git project. Last night, whilst clearing out a stale "stash stack", I did "git stash pop". There were conflicts in two files. However, all the popped files became staged. This doesn't normally happen. It was intensely irritating, and required me to do "git reset HEAD" on each of the file

[PATCH] git-p4.py: add support for filetype change

2015-12-21 Thread Romain Picard
After changing the type of a file in the git repository, it is not possible to "git p4 publish" the commit to perforce. This is due to the fact that the git "T" status is not handled in git-p4.py. This can typically occur when replacing an existing file with a symbolic link. The "T" modifier is no

Re: [git-for-windows] Case insensitive branch names

2015-12-21 Thread Duy Nguyen
On Mon, Dec 21, 2015 at 6:01 PM, Philip Oakley wrote: > On the Git User's list, Diego J. reported that: > > 'When I "checkout" a branch using different Upper Case/Lower Case than the > original, the branch doesn't show in "git branch [--list]"' [1] > > While case sensitivity for filenames is a com

Case insensitive branch names

2015-12-21 Thread Philip Oakley
On the Git User's list, Diego J. reported that: 'When I "checkout" a branch using different Upper Case/Lower Case than the original, the branch doesn't show in "git branch [--list]"' [1] While case sensitivity for filenames is a common issue on Windows and the like, I haven't seen any discussion

[PATCH] Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"

2015-12-21 Thread Nguyễn Thái Ngọc Duy
This commit has caused three regression reports so far. All of them are about spawning git subprocesses, where the new presence of GIT_WORK_TREE either changes command behaviour (git-init or git-clone), or how repo/worktree is detected (from aliases), with or without $GIT_DIR. The original bug will

Re: -C option with pull doesn't seem to be respected in aliases in git 2.6.4.

2015-12-21 Thread Duy Nguyen
On Mon, Dec 21, 2015 at 8:17 AM, Duy Nguyen wrote: > On Fri, Dec 18, 2015 at 8:35 AM, Cameron Esfahani wrote: >> I have git project checked out at ~/llvm. Inside of there, inside of a >> “tools” directory, I have another project checked out as “lldb”: >> >> ~/llvm/tools/lldb >> >> I wrote an al