strange behavior of git diff-index

2019-05-22 Thread Oussama Ghorbel
Hi, git diff-index is giving me incorrect information, however if I run git diff, then git diff-index again it will show the correct information. The steps are the following: $ git diff-index --name-only HEAD git appears to list all files in the project irrespective if they modified or not $ git

[ANNOUNCE] Git Rev News edition 51

2019-05-22 Thread Christian Couder
Hi everyone, The 51th edition of Git Rev News is now published: https://git.github.io/rev_news/2019/05/22/edition-51/ Thanks a lot to David Pursehouse, Luca Milanesio and Denton Liu who contributed this month! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [PATCH] upload-pack: strip namespace from symref data

2019-05-22 Thread Ævar Arnfjörð Bjarmason
On Wed, May 22 2019, Jeff King wrote: > Since 7171d8c15f (upload-pack: send symbolic ref information as > capability, 2013-09-17), we've sent cloning and fetching clients special > information about which branch HEAD is pointing to, so that they don't > have to guess based on matching up commit

GIT by github 2.21.0 got reviewed on Software Informer

2019-05-22 Thread Kasey Bloome
Good day! would like to inform you that your product GIT by github 2.21.0 has been reviewed by our editors and your program got "Editor's Pick Award", "100% Clean Award". You can read the review at https://git.software.informer.com/. We would be grateful if you place our award with a link to o

Re: [PATCH 0/1] trace2: fix tracing when NO_PTHREADS is defined

2019-05-22 Thread Jeff Hostetler
On 5/21/2019 5:27 PM, Jeff King wrote: On Tue, May 21, 2019 at 12:33:58PM -0700, Jeff Hostetler via GitGitGadget wrote: As Duy suggested, pthread_getspecific() just returns NULL when NO_PTHREADS is defined. And pthread_setspecific() silently does not nothing. So this problem was hidden from

RE: [Breakage] 2.22.0-rc1 t5401-update-hooks.sh

2019-05-22 Thread Randall S. Becker
On May 21, 2019 20:48, brian m. carlson wrote: > To: Randall S. Becker > Cc: 'Git Mailing List' > Subject: Re: [Breakage] 2.22.0-rc1 t5401-update-hooks.sh > > On 2019-05-21 at 21:47:54, Randall S. Becker wrote: > > When running the test in isolation, it passes without incident whether > > or not

Re: strange behavior of git diff-index

2019-05-22 Thread Johannes Schindelin
Hi Oussama, On Wed, 22 May 2019, Oussama Ghorbel wrote: > git diff-index is giving me incorrect information, however if I run git diff, > then git diff-index again it will show the correct information. > The steps are the following: > $ git diff-index --name-only HEAD > git appears to list all f

Re: strange behavior of git diff-index

2019-05-22 Thread Oussama Ghorbel
Hi Johannes, Thanks a lot for the clarification! Regards, Oussama On 5/22/19 4:54 PM, Johannes Schindelin wrote: > Hi Oussama, > > On Wed, 22 May 2019, Oussama Ghorbel wrote: > >> git diff-index is giving me incorrect information, however if I run git >> diff, then git diff-index again it will s

Re: Revision walking, commit dates, slop

2019-05-22 Thread Jakub Narebski
Derrick Stolee writes: > On 5/20/2019 7:27 PM, Jakub Narebski wrote: >> Jakub Narebski writes: >>> Derrick Stolee writes: On 5/20/2019 7:02 AM, Jakub Narebski wrote: > > Are there any blockers that prevent the switch to this > "generation number v2"? >> [...] >>

standalone library/tool to query commit-graph?

2019-05-22 Thread Karl Ostmo
After producing the file ".git/objects/info/commit-graph" with the command "git commit-graph write", is there a way to answer queries like "git merge-base --is-ancestor" without having a .git directory? E.g. is there a library that will operate on the "commit-graph" file all by itself? Thanks, Kar

Re: standalone library/tool to query commit-graph?

2019-05-22 Thread Derrick Stolee
On 5/22/2019 2:49 PM, Karl Ostmo wrote: > After producing the file ".git/objects/info/commit-graph" with the > command "git commit-graph write", is there a way to answer queries > like "git merge-base --is-ancestor" without having a .git directory? > E.g. is there a library that will operate on the

Re: Revision walking, commit dates, slop

2019-05-22 Thread Derrick Stolee
On 5/22/2019 2:29 PM, Jakub Narebski wrote: > Derrick Stolee writes: >> On 5/20/2019 7:27 PM, Jakub Narebski wrote: > Restating it yet again: > >A. corrected_date(C) = max(committer_date(C), >max_P(committer_date(P) + offset(P)) + 1) > >B. offset(C) = ma

[PATCH v2 07/11] commit-graph: write commit-graph chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Extend write_commit_graph() to write a commit-graph chain when given the COMMIT_GRAPH_SPLIT flag. This implementation is purposefully simplistic in how it creates a new chain. The commits not already in the chain are added to a new tip commit-graph file. Much of the logic a

[PATCH v2 05/11] commit-graph: add base graphs chunk

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To quickly verify a commit-graph chain is valid on load, we will read from the new "Base Graphs Chunk" of each file in the chain. This will prevent accidentally loading incorrect data from manually editing the commit-graph-chain file or renaming graph-{hash}.graph files. The

[PATCH v2 04/11] commit-graph: load commit-graph chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Prepare the logic for reading a chain of commit-graphs. First, look for a file at $OBJDIR/info/commit-graph. If it exists, then use that file and stop. Next, look for the chain file at $OBJDIR/info/commit-graphs/commit-graph-chain. If this file exists, then load the hash va

[PATCH v2 09/11] commit-graph: merge commit-graph chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee When searching for a commit in a commit-graph chain of G graphs with N commits, the search takes O(G log N) time. If we always add a new tip graph with every write, the linear G term will start to dominate and slow the lookup process. To keep lookups fast, but also keep most

[PATCH v2 11/11] commit-graph: expire commit-graph files

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee As we merge commit-graph files in a commit-graph chain, we should clean up the files that are no longer used. This change introduces an 'expiry_window' value to the context, which is always zero (for now). We then check the modified time of each graph-{hash}.graph file in th

[PATCH v2 06/11] commit-graph: rearrange chunk count logic

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The number of chunks in a commit-graph file can change depending on whether we need the Extra Edges Chunk. We are going to add more optional chunks, and it will be helpful to rearrange this logic around the chunk count before doing so. Specifically, we need to finalize the n

[PATCH v2 03/11] commit-graph: rename commit_compare to oid_compare

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The helper function commit_compare() actually compares object_id structs, not commits. A future change to commit-graph.c will need to sort commit structs, so rename this function in advance. Signed-off-by: Derrick Stolee --- commit-graph.c | 4 ++-- 1 file changed, 2 inser

[PATCH v2 08/11] commit-graph: add --split option to builtin

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Add a new "--split" option to the 'git commit-graph write' subcommand. This option allows the optional behavior of writing a commit-graph chain. The current behavior will add a tip commit-graph containing any commits that are not in the existing commit-graph or commit-graph

[PATCH v2 01/11] commit-graph: document commit-graph chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Add a basic description of commit-graph chains. More details about the feature will be added as we add functionality. This introduction gives a high-level overview to the goals of the feature and the basic layout of commit-graph chains. Signed-off-by: Derrick Stolee --- Do

[PATCH v2 02/11] commit-graph: prepare for commit-graph chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee To prepare for a chain of commit-graph files, augment the commit_graph struct to point to a base commit_graph. As we load commits from the graph, we may actually want to read from a base file according to the graph position. The "graph position" of a commit is given by conca

[PATCH v2 10/11] commit-graph: allow cross-alternate chains

2019-05-22 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee In an environment like a fork network, it is helpful to have a commit-graph chain that spans both the base repo and the fork repo. The fork is usually a small set of data on top of the large repo, but sometimes the fork is much larger. For example, git-for-windows/git has alm

[PATCH v2 00/11] [RFC] Commit-graph: Write incremental files

2019-05-22 Thread Derrick Stolee via GitGitGadget
This patch series is marked as RFC quality because it is missing some key features and tests, but hopefully starts a concrete discussion of how the incremental commit-graph writes can work. This version takes the design suggestions from the earlier discussion and tries to work out most of the conce

[PATCH] fetch-pack: send server options after command

2019-05-22 Thread Jonathan Tan
Currently, if any server options are specified during a protocol v2 fetch, server options will be sent before "command=fetch". Write server options to the request buffer in send_fetch_request() so that the components of the request are sent in the correct order. The protocol documentation states t

Re: [PATCH 4/5] send-email: fix regression in sendemail.identity parsing

2019-05-22 Thread Johannes Schindelin
Hi Ævar, On Fri, 17 May 2019, Ævar Arnfjörð Bjarmason wrote: > diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh > index 61d484d1a6..890e2874c3 100755 > --- a/t/t9001-send-email.sh > +++ b/t/t9001-send-email.sh > @@ -1228,6 +1228,61 @@ test_expect_success $PREREQ 'sendemail.to works' ' >

[GSoC] Blogging with Rohit

2019-05-22 Thread Rohit Ashiwal
Hey all Here I am with one more blog[1], where I talked about how we are implementing `--skip` flag for git-cherry-pick. How you'll enjoy reading this. Thanks Rohit [1]: https://rashiwal.me/2019/to-pick-or-not-to-pick/ PS: comment section is now working, please leave your constructive remarks.

Re: [GSoC] Blogging with Rohit

2019-05-22 Thread Rohit Ashiwal
s/How/Hope/ 😅 > Thanks > Rohit > > [1]: https://rashiwal.me/2019/to-pick-or-not-to-pick/ > PS: comment section is now working, please leave your constructive remarks. >

Re: [PATCH v2] status: add an empty line when there is no hint

2019-05-22 Thread 林自均
Hi Junio, 林自均 於 2019年5月15日 週三 上午11:02寫道: > > Hi Junio, > > Junio C Hamano 於 2019年5月15日 週三 上午8:48寫道: > > > > 林自均 writes: > > > > > I was not talking about the messages in the editor session. I was > > > talking about "git commit" without "git add" anything. > > > > > > For example: > > > > > > `

git describe/contains for submodule commits

2019-05-22 Thread Jacob Keller
Hi, I've had a few times where I was curious of when a submodule got set to a specific commit. I noticed that git describe has "blob" support, which outputs something like :/path/to/file using the revision walking machinery. I'm curious if anyone knows if that sort of revision walk could be ex

Re: [PATCH] Make stashing nothing exit 1

2019-05-22 Thread Maksim Odnoletkov
Junio C Hamano writes: > Keith Smiley writes: > > > In the case there are no files to stash, but the user asked to stash, we > > should exit 1 since the stashing failed. > > --- > > Sorry, but I fail to see why this is a good change. Did you have > some script that wanted the exit code from "

Re: git describe/contains for submodule commits

2019-05-22 Thread Ævar Arnfjörð Bjarmason
On Thu, May 23 2019, Jacob Keller wrote: > Hi, > > I've had a few times where I was curious of when a submodule got set > to a specific commit. > > I noticed that git describe has "blob" support, which outputs something like > > :/path/to/file > > using the revision walking machinery. > > I'm cu

Re: [PATCH] Make stashing nothing exit 1

2019-05-22 Thread Ævar Arnfjörð Bjarmason
On Thu, May 23 2019, Maksim Odnoletkov wrote: > Junio C Hamano writes: > >> Keith Smiley writes: >> >> > In the case there are no files to stash, but the user asked to stash, we >> > should exit 1 since the stashing failed. >> > --- >> >> Sorry, but I fail to see why this is a good change. Di

[PATCH] send-email: Add an option to suppress adding a specific email address

2019-05-22 Thread Eric W. Biederman
Make it easy to suppress sta...@vger.kernel.org. Long story short it is desirable to have ``Cc: sta...@vger.kernel.org'' on many bug fixes sent to the linux kernel. It is not always desirable to actually the stable maintainer immediately as the patches are still being reviewed etc. Actually cc

[PATCH] send-email: Add an option to suppress adding a specific email address

2019-05-22 Thread Eric W. Biederman
Make it easy to suppress sta...@vger.kernel.org. Long story short it is desirable to have ``Cc: sta...@vger.kernel.org'' on many bug fixes sent to the linux kernel. It is not always desirable to actually the stable maintainer immediately as the patches are still being reviewed etc. Actually cc

Re: [PATCH v2 09/11] commit-graph: merge commit-graph chains

2019-05-22 Thread Ævar Arnfjörð Bjarmason
On Wed, May 22 2019, Derrick Stolee via GitGitGadget wrote: > To keep lookups fast, but also keep most incremental writes fast, create > a strategy for merging levels of the commit-graph chain. The strategy is > detailed in the commit-graph design document, but is summarized by these > two condi

Re: [PATCH] send-email: Add an option to suppress adding a specific email address

2019-05-22 Thread Ævar Arnfjörð Bjarmason
On Thu, May 23 2019, Eric W. Biederman wrote: > Make it easy to suppress sta...@vger.kernel.org. Long story short it > is desirable to have ``Cc: sta...@vger.kernel.org'' on many bug fixes > sent to the linux kernel. It is not always desirable to actually the > stable maintainer immediately as

[PATCH v3] doc: hint about GIT_DEBUGGER in CodingGuidelines

2019-05-22 Thread Emily Shaffer
We check for a handy environment variable GIT_DEBUGGER when running via bin-wrappers/, but this feature is undocumented. Add a hint to how to use it into the CodingGuidelines (which is where other useful environment settings like DEVELOPER are documented). You can use GIT_DEBUGGER to pick gdb by d

Re: [PATCH 0/1] trace2: fix tracing when NO_PTHREADS is defined

2019-05-22 Thread Jeff King
On Wed, May 22, 2019 at 09:23:39AM -0400, Jeff Hostetler wrote: > I was wondering about that too as the proper long term solution. > We would need (as the discussion suggests [1]) to properly > respect/represent the pthread_key_t argument. > > For now, I've guarded my usage of pthread_getspecific

[PATCH v2] upload-pack: strip namespace from symref data

2019-05-22 Thread Jeff King
On Wed, May 22, 2019 at 12:33:56PM +0200, Ævar Arnfjörð Bjarmason wrote: > > Likely nobody noticed because bug (1) means that from the client's > > perspective, we did not report on HEAD at all. And thus it uses the > > pre-7171d8c15f fallback code to guess the correct HEAD, which is usually > > r

Re: [PATCH] Make stashing nothing exit 1

2019-05-22 Thread Johannes Sixt
Am 23.05.19 um 01:57 schrieb Maksim Odnoletkov: > The problem with current behaviour is it makes it hard to use stash in > scripts. A natural stash use case is: wrap some operation requiring a > clean working tree with a stash push-pop pair. But that doesn't work > properly when working tree is alr

Re: [PATCH 3/4] am: drop tty requirement for --interactive

2019-05-22 Thread Johannes Schindelin
Hi Peff, On Mon, 20 May 2019, Jeff King wrote: > On Mon, May 20, 2019 at 08:11:13AM -0400, Jeff King wrote: > > > We have required that the stdin of "am --interactive" be a tty since > > a1451104ac (git-am: interactive should fail gracefully., 2005-10-12). > > However, this isn't strictly necessa