Re: [PATCH v2] worktree: allow to (re)move worktrees with uninitialized submodules

2019-01-05 Thread Eric Sunshine
On Fri, Jan 4, 2019 at 5:51 PM Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > Uninitialized submodules have nothing valueable for us to be worried > > about. They are just SHA-1. Let "worktree remove" and "worktree move" > > continue in this case so that people can still use multiple w

Re: A few questions regarding git annotated tags

2019-01-05 Thread Jeff King
On Sat, Jan 05, 2019 at 04:50:30PM +0100, Michal Novotny wrote: > I could potentially make it so that I tag subtrees instead of commits > and then derive the needed information from these subtree tags. This > could be useful if I have multiple rpm packages in different subtrees > of the same repo.

Re: [PATCH v3] Simplify handling of setup_git_directory_gently() failure cases.

2019-01-05 Thread Jeff King
On Sat, Jan 05, 2019 at 08:57:32AM -0800, Erin Dahlgren wrote: > > So what next? Erin, are you interested in using the details of this > > conversation to take the cleanups a bit further? > > Sure, no problem. If this is urgent, then I would probably be more > inclined to keep this small and do m

Re: [PATCH 1/3] Add 'human' date format

2019-01-05 Thread Jeff King
On Fri, Jan 04, 2019 at 06:03:18AM -0700, Stephen P Smith wrote: > On Friday, January 4, 2019 12:50:35 AM MST Jeff King wrote: > > On Thu, Jan 03, 2019 at 06:19:56AM -0700, Stephen P. Smith wrote: > > > > > > I didn't see anything in the code which would prohibit setting something > > > like that

Re: Git extra hook, pre-upload

2019-01-05 Thread Jeff King
[re-add git@vger cc] On Sat, Jan 05, 2019 at 01:47:11PM +0900, Xheroz 128 wrote: > Thank you for all your replies. I have read the thread from 2011 and > understand the reason of the insecure part using pre and post upload > hooks. > But for my project I would still like to use pre-upload hook. B

Re: How DELTA objects values work and are calculated

2019-01-05 Thread Duy Nguyen
On Sun, Jan 6, 2019 at 5:32 AM Farhan Khan wrote: > Hi Duy, > > Thanks for explaining the Delta objects. > > What does a OBJ_REF_DELTA object itself consist of? from pack-format.txt (deltified representation) n-byte type and length (3-bit type, (n-1)*7+4-bit length) 20-byte base o

[PATCH v5 3/3] branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree

2019-01-05 Thread nbelakovski
From: Nickolai Belakovski --- Documentation/git-branch.txt | 5 - builtin/branch.c | 4 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index b3eca6ffdc..6d1fc59e32 100644 --- a/Documentation/git-branc

[PATCH v5 1/3] ref-filter: add worktreepath atom

2019-01-05 Thread nbelakovski
From: Nickolai Belakovski Add an atom providing the path of the linked worktree where this ref is checked out, if it is checked out in any linked worktrees, and empty string otherwise. --- Documentation/git-for-each-ref.txt | 5 +++ ref-filter.c | 71 ++

[PATCH v5 0/3]

2019-01-05 Thread nbelakovski
From: Nickolai Belakovski Replying to my original email to try to clean up the email chain > Thanks for keeping with this. I think we're getting quite close Thanks to you as well for continuing to review the change set and provide feedback! It does feel rather close, I'm getting exciting abou

[PATCH v5 2/3] branch: Mark and color a branch differently if it is checked out in a linked worktree

2019-01-05 Thread nbelakovski
From: Nickolai Belakovski In order to more clearly display which branches are active, the output of git branch is modified to mark branches checkout out in a linked worktree with a "+" and color them in cyan (in contrast to the current branch, which will still be denoted with a "*" and colored in

Make "git log --count" work like "git rev-list"

2019-01-05 Thread Linus Torvalds
This is a ridiculous patch. And I understand entirely if nobody else cares, because I don't think anybody else has ever even noticed. It turns out that I still use "git rev-list" outside of some hard-core scripting for one silly reason: the linux-next statistics are all about non-merge commits, an

Re: How DELTA objects values work and are calculated

2019-01-05 Thread Farhan Khan
On 1/4/19 11:46 PM, Duy Nguyen wrote: On Sat, Jan 5, 2019 at 9:49 AM Farhan Khan wrote: Hi all, I'm having trouble understanding how OBJ_REF_DELTA and OBJ_REF_DELTA (deltas) work in git. Where does git calculate the sha1 hash values when doing "git index-pack" in builtin/index-pack.c. I th

Re: [git-users] git checkout file with custom mtime

2019-01-05 Thread Daniel Fanjul
I'm on Ubuntu. I do not use LFS. I track mods and saved games of Skyrim with git, TESV.exe sorts the saved games only by their mtime. I know it is not the most usual use case for git. I agree with that viewpoint and I like the way git works right now, I do not want to change that. Checking out the

Re: [git-users] git checkout file with custom mtime

2019-01-05 Thread Philip Oakley
Daniel, Do you use the Git LFS (Large File System) add-on?, are you on Windows or Linux?, and what tools need mtime (or is it something about the process of using the tool..)? The Git viewpoint is that the mtime shouldn't be important for the version storage & control aspects, though it may

Re: [PATCH] diff: add support for reading files literally with --no-index

2019-01-05 Thread brian m. carlson
On Fri, Jan 04, 2019 at 11:26:56AM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > >> - --dereference to control whether to follow symlinks > > > > This is actually surprisingly difficult. The reason I implemented this > > only for no-index mode is because there are actually severa

Re: [PATCH v3] Simplify handling of setup_git_directory_gently() failure cases.

2019-01-05 Thread Erin Dahlgren
On Fri, Jan 4, 2019 at 12:26 AM Jeff King wrote: > > On Thu, Jan 03, 2019 at 10:09:18AM -0800, Junio C Hamano wrote: > > > >> @@ -1132,7 +1142,10 @@ const char *setup_git_directory_gently(int > > >> *nongit_ok) > > >> * the user has set GIT_DIR. It may be beneficial to disallow bogus > > >>

A few questions regarding git annotated tags

2019-01-05 Thread Michal Novotny
Hello, I am making an rpm packaging application called rpkg-util (https://pagure.io/rpkg-util) that can render parts of rpm metadata from git metadata, e.g. software version. It uses annotated tags to store most of the data that are then rendered to an rpm spec file (e.g. the version or changelog)

Re: [PATCH 02/10] repository.c: replace hold_locked_index() with repo_hold_locked_index()

2019-01-05 Thread Martin Ågren
On Sat, 5 Jan 2019 at 07:07, Nguyễn Thái Ngọc Duy wrote: > > hold_locked_index() assumes the index path at $GIT_DIR/index. This is > not good for places that take an arbitrary index_state instead of > the_index, which is basically everywhere except builtin/. > > Replace it with repo_hold_locked_in

[PATCH v2] Add optional targets for documentation l10n

2019-01-05 Thread Jean-Noël Avila
From: Jean-Noel Avila The standard doc lists can be filtered to allow using the compilation rules with translated manpages where all the pages of the original version may not be present. The install variable are reused in the secondary repo so that the configured paths can be used for translated

Re: [PATCH 1/1] Add optional targets for documentation l10n

2019-01-05 Thread Jean-Noël AVILA
On Friday, 4 January 2019 22:05:10 CET Junio C Hamano wrote: > Jean-Noël Avila writes: > > > From: Jean-Noel Avila > > > > The standard doc lists can be filtered to allow using the compilation > > rules with translated manpages where all the pages of the original > > version may not be present.