Re: [PATCH v1 2/2] log: add option to choose which refs to decorate

2017-11-03 Thread Junio C Hamano
Rafael Ascensão writes: > When `log --decorate` is used, git will decorate commits with all > available refs. While in most cases this the desired effect, under some > conditions it can lead to excessively verbose output. Correct. > Using `--exclude=` can help mitigate that verboseness by > rem

Re: [PATCH v1 1/2] refs: extract function to normalize partial refs

2017-11-03 Thread Junio C Hamano
Rafael Ascensão writes: > `for_each_glob_ref_in` has some code built into it that converts > partial refs like 'heads/master' to their full qualified form s/full/&y/ (read: that "full" needs "y" at the end). > 'refs/heads/master'. It also assume a trailing '/*' if no glob s/assume/&s/ > chara

Bug report: git reset --hard does not fix submodule worktree

2017-11-03 Thread Billy O'Neal (VC LIBS)
Hello, Git folks. I managed to accidentally break the our test lab by attempting to git mv a directory with a submodule inside. It seems like if a reset does an undo on a mv, the workfold entry should be fixed to put the submodule in its old location. Consider the following sequence of commands:

[PATCH v1 2/2] log: add option to choose which refs to decorate

2017-11-03 Thread Rafael Ascensão
When `log --decorate` is used, git will decorate commits with all available refs. While in most cases this the desired effect, under some conditions it can lead to excessively verbose output. Using `--exclude=` can help mitigate that verboseness by removing unnecessary 'branches' from the output.

[PATCH v1 1/2] refs: extract function to normalize partial refs

2017-11-03 Thread Rafael Ascensão
`for_each_glob_ref_in` has some code built into it that converts partial refs like 'heads/master' to their full qualified form 'refs/heads/master'. It also assume a trailing '/*' if no glob characters are present in the pattern. Extract that logic to its own function which can be reused elsewhere

[PATCH v1 0/2] Add option to git log to choose which refs receive decoration

2017-11-03 Thread Rafael Ascensão
As suggested by Documentation/SubmittingPatches Hi, this is my first patch.\n I basically stumbled on the same issue mentioned here: https://public-inbox.org/git/xmqqzim1pp4m@gitster.mtv.corp.google.com/ This patch implements two new command line options for `git log`: `--decorate-refs=` and

Re: [PATCH] fix typos in 2.15.0 release notes

2017-11-03 Thread Jonathan Nieder
Hi, Jean Carlo Machado wrote: > --- > Documentation/RelNotes/2.15.0.txt | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Thanks! Can we have your sign-off? (See Documentation/SubmittingPatches section 5 "Certify your work" for what this means.) Sincerely, Jonathan

[PATCH] fix typos in 2.15.0 release notes

2017-11-03 Thread Jean Carlo Machado
--- Documentation/RelNotes/2.15.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt index 248ba70c3..cdd761bcc 100644 --- a/Documentation/RelNotes/2.15.0.txt +++ b/Documentation/RelNotes/2.15.0.txt @

[PATCH] credential-libsecret: unlock locked secrets

2017-11-03 Thread Dennis Kaarsemaker
Credentials exposed by the secret service DBUS interface may be locked. Setting the SECRET_SEARCH_UNLOCK flag will make the secret service unlock these secrets, possibly prompting the user for credentials to do so. Without this flag, the secret is simply not loaded. Signed-off-by: Dennis Kaarsemak

Re: [PATCH 04/14] fetch: add object filtering for partial fetch

2017-11-03 Thread Jonathan Tan
I did some of my own investigation and have a working (i.e. passing tests) version of this patch here: https://github.com/jonathantanmy/git/commits/pc20171103 If you want, you can use that, or incorporate the changes therein here. I'll also remark on my findings inline. On Thu, 2 Nov 2017 20:31

Re: [PATCH 02/14] clone, fetch-pack, index-pack, transport: partial clone

2017-11-03 Thread Jonathan Tan
On Thu, 2 Nov 2017 20:31:17 + Jeff Hostetler wrote: > From: Jeff Hostetler > > Signed-off-by: Jeff Hostetler > --- > builtin/clone.c | 9 + > builtin/fetch-pack.c | 4 > builtin/index-pack.c | 10 ++ > fetch-pack.c | 13 + > fetch-pack.h

Re: submodule using revision

2017-11-03 Thread Jacob Keller
On Fri, Nov 3, 2017 at 6:42 AM, gregory grey wrote: > Hi guys. > > Currently git submodule only works with branch of the submodule in > question. Adding a functionality to work with a revision would be > great from my point of view. > > Proposed syntax is as follows: > git submodule add -r commit_

[PATCH] config: document blame configuration

2017-11-03 Thread Stefan Beller
The options are currently only referenced by the git-blame man page, also explain them in git-config, which is the canonical page to contain all config options. Signed-off-by: Stefan Beller --- Now with 'commit object name'. Thanks! Documentation/config.txt | 17 + 1 file ch

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

2017-11-03 Thread Jeff King
On Fri, Nov 03, 2017 at 10:44:08PM +0900, Junio C Hamano wrote: > Simon Ruderich writes: > > > I tried looking into this by adding a new write_file_buf_gently() > > (or maybe renaming write_file_buf to write_file_buf_or_die) and > > using it from write_file_buf() but I don't know the proper way

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-11-03 Thread Stefan Beller
On Fri, Nov 3, 2017 at 2:32 AM, Kaartic Sivaraam wrote: > On Monday 23 October 2017 11:07 PM, Stefan Beller wrote: >> >> Exactly. By memory I mean volatile RAM (as opposed to >> memory on a spinning disk). >> >> Using GIT_TEST_OPTS has had some issues (I remember vaguely >> there was an inconsiste

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

2017-11-03 Thread Jeff King
On Fri, Nov 03, 2017 at 03:46:44PM +0100, Johannes Schindelin wrote: > > I tried looking into this by adding a new write_file_buf_gently() > > (or maybe renaming write_file_buf to write_file_buf_or_die) and > > using it from write_file_buf() but I don't know the proper way to > > handle the error-

Re: [PATCH 1/9] extension.partialclone: introduce partial clone extension

2017-11-03 Thread Jonathan Tan
On Fri, 3 Nov 2017 09:57:18 -0400 Jeff Hostetler wrote: > On 11/2/2017 6:24 PM, Jonathan Tan wrote: > > On Thu, 2 Nov 2017 20:20:44 + > > Jeff Hostetler wrote: > > > >> From: Jeff Hostetler > >> > >> Introduce the ability to have missing objects in a repo. This > >> functionality is guar

Re: [PATCH] setup: avoid double slashes when looking for HEAD

2017-11-03 Thread Jeff King
On Fri, Nov 03, 2017 at 01:58:02PM +0100, Johannes Schindelin wrote: > From: Jeff King > > Andrew Baumann reported that when called outside of any Git worktree, > `git rev-parse --is-inside-work-tree` eventually tries to access > `//HEAD`, i.e. any `HEAD` file in the root directory, but with a

Re: [PATCH v2 0/6] Partial clone part 1: object filtering

2017-11-03 Thread Jeff Hostetler
On 11/3/2017 11:05 AM, Junio C Hamano wrote: Jeff Hostetler writes: Yes, I thought we should have both (perhaps renamed or combined into 1 parameter with value, such as --exclude=missing vs --exclude=promisor) and let the user decide how strict they want to be. Assuming we eventually get p

Re: git tries to stat //HEAD when searching for a repo, leading to huge delays on Cygwin

2017-11-03 Thread Jeff King
On Fri, Nov 03, 2017 at 01:32:26PM +0100, Johannes Schindelin wrote: > > diff --git a/setup.c b/setup.c > > index 27a31de33f..5d0b6a88e3 100644 > > --- a/setup.c > > +++ b/setup.c > > @@ -283,7 +283,9 @@ int is_git_directory(const char *suspect) > > size_t len; > > > > /* Check worktree-

Re: Git libsecret No Unlock Dialog Issue

2017-11-03 Thread Yaroslav Sapozhnyk
What version should include this fix? Cannot find a pr for it. Thanks for providing the fix! Regards, Yaroslav On Thu, Nov 2, 2017 at 3:48 PM, Yaroslav Sapozhnyk wrote: > I've tested the code change locally and seems like it fixes the issue. > > Yaroslav > > On Thu, Nov 2, 2017 at 2:55 PM, Denn

Re: [PATCH] fix an 'dubious one-bit signed bitfield' error

2017-11-03 Thread Jeff Hostetler
d'oh. thanks! On 11/3/2017 1:05 PM, Ramsay Jones wrote: Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jh/object-filtering' branch, could you please squash this into the relevant commit (b87fd93d81, "list-objects: filter objects in traverse_commit_list", 02-11-2017).

Re: git, isolation

2017-11-03 Thread Stefan Beller
On Fri, Nov 3, 2017 at 9:52 AM, Dennis Kaarsemaker wrote: > On Fri, 2017-11-03 at 17:33 +0100, Péter wrote: >> Hi, >> >> If I do a "git commit", issue git operations, and at the end, issue a "rm >> ", is there any guarantee that my >> filesystem will be "clean", > > No. > >> i.e. not polluted or

[PATCH] fix an 'dubious one-bit signed bitfield' error

2017-11-03 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, If you need to re-roll your 'jh/object-filtering' branch, could you please squash this into the relevant commit (b87fd93d81, "list-objects: filter objects in traverse_commit_list", 02-11-2017). [This error was issued by sparse] Thanks! ATB, Ramsay Jon

Re: git, isolation

2017-11-03 Thread Dennis Kaarsemaker
On Fri, 2017-11-03 at 17:33 +0100, Péter wrote: > Hi, > > If I do a "git commit", issue git operations, and at the end, issue a "rm > ", is there any guarantee that my > filesystem will be "clean", No. > i.e. not polluted or otherwise modified by some git command? Are the git > operations >

git, isolation

2017-11-03 Thread Péter
>If I do a "git commit" "git clone"

git, isolation

2017-11-03 Thread Péter
Hi, If I do a "git commit", issue git operations, and at the end, issue a "rm ", is there any guarantee that my filesystem will be "clean", i.e. not polluted or otherwise modified by some git command? Are the git operations restricted to the repo-directory (and possibly remote places, over netw

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-03 Thread Johannes Schindelin
Hi Orgad, On Fri, 3 Nov 2017, Johannes Schindelin wrote: > On Thu, 2 Nov 2017, Orgad Shaneh wrote: > > > I can't reproduce this with a minimal example, but it happens in my project. Whoa, I somehow overlooked the "can't". Sorry. > > What I tried to do for reproducing is: > > rm -rf super sub >

Re: Regression[2.14.3->2.15]: Interactive rebase fails if submodule is modified

2017-11-03 Thread Johannes Schindelin
Hi Orgad, On Thu, 2 Nov 2017, Orgad Shaneh wrote: > I can't reproduce this with a minimal example, but it happens in my project. > > What I tried to do for reproducing is: > rm -rf super sub > mkdir sub; cd sub; git init > git commit --allow-empty -m 'Initial commit' > mkdir ../super; cd ../supe

Re: [PATCH 00/14] WIP Partial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-11-03 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > This is part 3 of 3 for partial clone. > It assumes that part 1 [1] and part 2 [2] are in place. Thanks. As planned these replaced the partial clone with size filter thing from Jonathan. The resulting integration passed the tests locally so I

Greetings in the name of God, Business proposal in God we trust

2017-11-03 Thread Mrs, Suran Yoda
Hello Dear, I am DR DANIEL MMINELE THE DEPUTY GOVERNOR OF SOUTH AFRICAN RESERVE BANK,YOU CAN VISIT THIS WEB SITE FOR YOUR CONFIRMATION:http://www.whoswhosa.co.za/south-african-reserve-bank-20991 , I know my message will come to you as a surprise. Don't worry I was totally convinced to write

Re: [PATCH v2 0/6] Partial clone part 1: object filtering

2017-11-03 Thread Junio C Hamano
Jeff Hostetler writes: > Yes, I thought we should have both (perhaps renamed or combined > into 1 parameter with value, such as --exclude=missing vs --exclude=promisor) > and let the user decide how strict they want to be. Assuming we eventually get promisor support working, would there be any u

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

2017-11-03 Thread Junio C Hamano
Jacob Keller writes: > On Thu, Nov 2, 2017 at 10:18 PM, Junio C Hamano wrote: >> ... >> It is easy to imagine that we can restrict "git log" traversal with >> a "--blobchange=" option instead of (or in addition to) the >> limitation gives us. Instead of treating a commit whose >> diff against

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

2017-11-03 Thread Johannes Schindelin
Hi Simon, On Fri, 3 Nov 2017, Simon Ruderich wrote: > On Wed, Nov 01, 2017 at 06:16:18PM -0400, Jeff King wrote: > > On Wed, Nov 01, 2017 at 10:46:14PM +0100, Johannes Schindelin wrote: > >> I spent substantial time on making the sequencer code libified (it was far > >> from it). That die() call

Re: [PATCH 00/14] WIP Partial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-11-03 Thread Jeff Hostetler
On 11/2/2017 7:41 PM, Jonathan Tan wrote: On Thu, 2 Nov 2017 20:31:15 + Jeff Hostetler wrote: From: Jeff Hostetler This is part 3 of 3 for partial clone. It assumes that part 1 [1] and part 2 [2] are in place. Part 3 is concerned with the commands: clone, fetch, upload-pack, fetch-pa

Re: [PATCH 1/9] extension.partialclone: introduce partial clone extension

2017-11-03 Thread Jeff Hostetler
On 11/2/2017 6:24 PM, Jonathan Tan wrote: On Thu, 2 Nov 2017 20:20:44 + Jeff Hostetler wrote: From: Jeff Hostetler Introduce the ability to have missing objects in a repo. This functionality is guarded by new repository extension options: `extensions.partialcloneremote` and

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

2017-11-03 Thread Junio C Hamano
Simon Ruderich writes: > I tried looking into this by adding a new write_file_buf_gently() > (or maybe renaming write_file_buf to write_file_buf_or_die) and > using it from write_file_buf() but I don't know the proper way to > handle the error-case in write_file_buf(). Just calling > die("write_f

Re: [PATCH v2 0/6] Partial clone part 1: object filtering

2017-11-03 Thread Jeff Hostetler
On 11/2/2017 3:44 PM, Jonathan Tan wrote: On Thu, 2 Nov 2017 17:50:07 + Jeff Hostetler wrote: From: Jeff Hostetler Here is V2 of the list-object filtering. It replaces [1] and reflect a refactoring and simplification of the original. Thanks, overall this looks quite good. I reviewed

submodule using revision

2017-11-03 Thread gregory grey
Hi guys. Currently git submodule only works with branch of the submodule in question. Adding a functionality to work with a revision would be great from my point of view. Proposed syntax is as follows: git submodule add -r commit_sha git://some_repository.git Thanks! -- http://ror6ax.github

Re: [PATCH v2 4/6] list-objects: filter objects in traverse_commit_list

2017-11-03 Thread Jeff Hostetler
On 11/3/2017 7:54 AM, Johannes Schindelin wrote: Hi Jonathan, On Thu, 2 Nov 2017, Jonathan Tan wrote: On Thu, 2 Nov 2017 17:50:11 + Jeff Hostetler wrote: +int parse_list_objects_filter(struct list_objects_filter_options *filter_options, + const char *arg)

[PATCH] setup: avoid double slashes when looking for HEAD

2017-11-03 Thread Johannes Schindelin
From: Jeff King Andrew Baumann reported that when called outside of any Git worktree, `git rev-parse --is-inside-work-tree` eventually tries to access `//HEAD`, i.e. any `HEAD` file in the root directory, but with a double slash. This double slash is not only unintentional, but is allowed by th

Re: [PATCH] setup.c: don't try to access '//HEAD' during repo discovery

2017-11-03 Thread Johannes Schindelin
Hi Gábor, On Fri, 3 Nov 2017, SZEDER Gábor wrote: > Commit ce9b8aab5 (setup_git_directory_1(): avoid changing global state, > 2017-03-13) changed how the git directory is discovered, and as a side > effect when the discovery reaches the root directory Git tries to > access paths like '//HEAD' and

Re: git tries to stat //HEAD when searching for a repo, leading to huge delays on Cygwin

2017-11-03 Thread Johannes Schindelin
Hi Peff, On Thu, 2 Nov 2017, Jeff King wrote: > On Thu, Nov 02, 2017 at 11:45:55PM +, Andrew Baumann wrote: > > > I have a workaround for this, but someone on stack overflow [1] > > suggested reporting it upstream, so here you go: > > > > I have a fancy shell prompt that executes "git rev-

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

2017-11-03 Thread Johannes Schindelin
Hi Stefan, On Thu, 2 Nov 2017, Stefan Beller wrote: > On Thu, Nov 2, 2017 at 12:23 AM, Andreas Schwab wrote: > > On Nov 01 2017, Johannes Schindelin wrote: > > > >> Sure, but it is still a tricky thing. Imagine > >> > >> - A1 - B1 - A2 - B2 - B3 > >> > >> where all the B* commits have the blob.

Re: [PATCH v2 4/6] list-objects: filter objects in traverse_commit_list

2017-11-03 Thread Johannes Schindelin
Hi Jonathan, On Thu, 2 Nov 2017, Jonathan Tan wrote: > On Thu, 2 Nov 2017 17:50:11 + > Jeff Hostetler wrote: > > > +int parse_list_objects_filter(struct list_objects_filter_options > > *filter_options, > > + const char *arg) > > Returning void is fine, I think. It

Re: [PATCH 3/3] mingw: document the experimental standard handle redirection

2017-11-03 Thread Johannes Schindelin
Hi Junio, On Fri, 3 Nov 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> If I was correct in assuming that "2>&1" is just as foreign as > >> ">/dev/null", then we should be shunning "2>&1" just like we shun > >> ">/dev/null". That was all I meant to say. > > > > Did you know th

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

2017-11-03 Thread Simon Ruderich
On Wed, Nov 01, 2017 at 06:16:18PM -0400, Jeff King wrote: > On Wed, Nov 01, 2017 at 10:46:14PM +0100, Johannes Schindelin wrote: >> I spent substantial time on making the sequencer code libified (it was far >> from it). That die() call may look okay now, but it is not at all okay if >> we want to

Re: Documentation for git-diff is very difficult to understand for a layman.

2017-11-03 Thread Jacob Keller
Hi, On November 3, 2017 2:43:03 AM PDT, Vladimir Nikishkin wrote: >Hello, honourable GIT developers. > >I would like to kindly ask you to do something with the git-diff >manpage. (https://git-scm.com/docs/git-diff) > >In fact, I wasn't able to understand it even after reading it a few >times.

Documentation for git-diff is very difficult to understand for a layman.

2017-11-03 Thread Vladimir Nikishkin
Hello, honourable GIT developers. I would like to kindly ask you to do something with the git-diff manpage. (https://git-scm.com/docs/git-diff) In fact, I wasn't able to understand it even after reading it a few times. In my case, I was trying to understand, what the command actually prints, but

Re: "Cannot fetch git.git" (worktrees at fault? or origin/HEAD) ?

2017-11-03 Thread Kaartic Sivaraam
On Monday 23 October 2017 11:07 PM, Stefan Beller wrote: Exactly. By memory I mean volatile RAM (as opposed to memory on a spinning disk). Using GIT_TEST_OPTS has had some issues (I remember vaguely there was an inconsistency between the output of `make test` and prove), so I put my entire worki

Re: [BUG] Incosistent repository state when trying to rename HEAD in the middle of a rebase

2017-11-03 Thread Kaartic Sivaraam
On Thursday 02 November 2017 01:21 PM, Junio C Hamano wrote: Kaartic Sivaraam writes: I was able to spare some time to dig into this and found a few things. First, it seems that the issue is more generic and the BUG kicks in whenever HEAD is not a symbolic ref. Interesting. Let me detail