Re: Git and SHA-1 security (again)

2016-07-19 Thread Duy Nguyen
On Mon, Jul 18, 2016 at 6:51 PM, Duy Nguyen wrote: > On Sun, Jul 17, 2016 at 4:21 PM, brian m. carlson > wrote: >> I'm going to end up having to do something similar because of the issue >> of submodules. Submodules may still be SHA-1, while the main repo may >> be

Re: t7063 failure on FreeBSD 10.3 i386/amd64

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 12:54 AM, Eric Wong wrote: > Oops, forgot to Cc some folks who worked on this :x > > Filesystem is ufs and it fails regardless of whether > soft-updates is enabled or not. Nothing stands out to my eyes, so I'm going to install freebsd this weekend. I hope ufs does not have

Re: Git and SHA-1 security (again)

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 7:06 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Post-shower thoughts. In a tree object, a submodule entry consists of >> perm (S_IFGITLINK), hash (which is the external hash) and path. We >> could fill the "hash" part with a

Re: Git and SHA-1 security (again)

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 7:34 PM, David Lang wrote: > On Tue, 19 Jul 2016, Duy Nguyen wrote: > >> On Tue, Jul 19, 2016 at 9:18 AM, Johannes Schindelin >> wrote: >>>> >>>> But we can recreate SHA-1 from the same content and verify GPG, right? >>>&

Re: Git and SHA-1 security (again)

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 7:59 PM, David Lang wrote: > On Tue, 19 Jul 2016, Duy Nguyen wrote: > >> On Tue, Jul 19, 2016 at 7:34 PM, David Lang wrote: >>> >>> On Tue, 19 Jul 2016, Duy Nguyen wrote: >>> >>>> On Tue, Jul 19, 2016 at 9:18 AM, Johann

Re: [PATCH] worktree: add: introduce the --name option

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 8:04 PM, Junio C Hamano wrote: > Antoine Tenart writes: > >> Adds a --name option allowing to specify the name of a worktree when >> creating it. This allows to have multiple worktrees in directories >> having the same name (e.g. project0/foo, project1/foo etc...). This >>

Re: [PATCH] worktree: add: introduce the --name option

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 8:54 PM, Antoine Tenart wrote: > On Tue, Jul 19, 2016 at 08:23:58PM +0200, Duy Nguyen wrote: >> On Tue, Jul 19, 2016 at 8:04 PM, Junio C Hamano wrote: >> >> 080739b (worktree.c: find_worktree() search by path suffix - >> 2016-06-13) from

Re: Current state of Git worktree used with submodules?

2016-07-19 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 10:59 PM, Lars Schneider wrote: > Hi, > > some time ago Michael wrote in a blog post [1]: > "It's not recommended to use git worktree with a repository that contains > submodules." > > Plus "Documentation/git-worktree.txt" states: > "Multiple checkout in general is still e

Re: Git and SHA-1 security (again)

2016-07-20 Thread Duy Nguyen
On Wed, Jul 20, 2016 at 2:28 PM, Johannes Schindelin wrote: > But that strategy *still* ignores the distributed nature of Git. Just > because *you* make that merge at a certain point does not necessarily mean > that I make it at that point, too. > > Any approach that tries to have one single point

Re: Git and SHA-1 security (again)

2016-07-20 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 8:58 PM, Herczeg Zsolt wrote: > 2016-07-19 20:04 GMT+02:00 Duy Nguyen : >> On Tue, Jul 19, 2016 at 7:59 PM, David Lang wrote: >>> On Tue, 19 Jul 2016, Duy Nguyen wrote: >>> >>>> On Tue, Jul 19, 2016 at 7:34 PM, David Lang wrot

Re: [PATCH] worktree: add: introduce the --name option

2016-07-20 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 9:35 PM, Antoine Tenart wrote: > On Tue, Jul 19, 2016 at 09:04:11PM +0200, Duy Nguyen wrote: >> On Tue, Jul 19, 2016 at 8:54 PM, Antoine Tenart >> wrote: >> > On Tue, Jul 19, 2016 at 08:23:58PM +0200, Duy Nguyen wrote: >> >> On T

Re: t7063 failure on FreeBSD 10.3 i386/amd64

2016-07-20 Thread Duy Nguyen
On Wed, Jul 20, 2016 at 5:02 AM, Eric Wong wrote: > Duy Nguyen wrote: >> On Tue, Jul 19, 2016 at 12:54 AM, Eric Wong wrote: >> > Oops, forgot to Cc some folks who worked on this :x >> > >> > Filesystem is ufs and it fails regardless of whether >> >

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Duy Nguyen
On Thu, Jul 21, 2016 at 1:22 AM, Stefan Beller wrote: > On Wed, Jul 20, 2016 at 10:24 AM, Nguyễn Thái Ngọc Duy > wrote: >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> Documentation/git-worktree.txt | 8 >> git-submodule.sh | 8 >> 2 files changed, 12 insertions

Re: [PATCH v4 2/4] submodule: update core.worktree using git-config

2016-07-22 Thread Duy Nguyen
On Thu, Jul 21, 2016 at 12:04 AM, Stefan Beller wrote: >> diff --git a/submodule.c b/submodule.c >> index abc2ac2..b912871 100644 >> --- a/submodule.c >> +++ b/submodule.c >> @@ -1128,7 +1128,9 @@ void connect_work_tree_and_git_dir(const char >> *work_tree, const char *git_dir) >> { >> s

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-22 Thread Duy Nguyen
On Fri, Jul 22, 2016 at 7:25 PM, Stefan Beller wrote: > On Fri, Jul 22, 2016 at 10:09 AM, Duy Nguyen wrote: >> >> I just quickly glanced through the rest of this mail because, as a >> submodule ignorant, it's just mumbo jumbo to me. But what I see here >> is, th

Re: [PATCH 00/10] git worktree (re)move

2016-07-23 Thread Duy Nguyen
On Sat, Jun 25, 2016 at 9:54 AM, Nguyễn Thái Ngọc Duy wrote: > Now that nd/worktree-lock seems to be on its way to 'next', let's > continue to review this one. The first 5 patches bring busybox's copy > functionality to git. The last 5 add support functions and the two new > commands. Mostly a no

Re: [PATCH v1 3/3] convert: add filter..useProtocol option

2016-07-25 Thread Duy Nguyen
On Sun, Jul 24, 2016 at 9:11 PM, Lars Schneider wrote: > > On 23 Jul 2016, at 10:14, Eric Wong wrote: > >> larsxschnei...@gmail.com wrote: >>> Please note that the protocol filters do not support stream processing >>> with this implemenatation because the filter needs to know the length of >>> th

Re: [RFC/PATCH 0/8] Add configuration options for split-index

2016-07-25 Thread Duy Nguyen
On Sat, Jul 23, 2016 at 6:11 PM, Christian Couder wrote: > Ok, I started working on automatically pushing back all changes to the > shared index when the percentage of entries in linked vs shared > indexes is greater than 25% (maybe I will make it configurable later). > It is very basic and doesn'

Re: [PATCH] t5510: become resilient to GETTEXT_POISON

2016-07-25 Thread Duy Nguyen
On Mon, Jul 25, 2016 at 5:16 PM, Junio C Hamano wrote: > On Mon, Jul 25, 2016 at 2:31 AM, Vasco Almeida wrote: >> Replace gettext poison text with appropriate values to be able to cut >> the right output of git fetch command for comparison. > > Hmm, as these tests are _all_ about human-readable o

Re: [PATCH] config.mak.uname: correct perl path on FreeBSD

2016-07-25 Thread Duy Nguyen
On Mon, Jul 25, 2016 at 6:56 PM, Junio C Hamano wrote: > On Mon, Jul 25, 2016 at 9:21 AM, Nguyễn Thái Ngọc Duy > wrote: >> It looks the the symlink /usr/bin/perl (to /usr/local/bin/perl) has >> been removed at least on FreeBSD 10.3. See [1] for more information. >> >> [1] >> https://svnweb.free

Re: [PATCH v4 1/4] worktree: add per-worktree config files

2016-07-26 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 2:59 AM, Stefan Beller wrote: > I like the user facing design, but how am I supposed to use it internally? > > Say I want to read a value preferably from the worktree I'd do a > /* > * maybe I don't even have to set it to 1 as > * the user is supposed to do th

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-26 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 1:25 AM, Stefan Beller wrote: > So what is the design philosophy in worktrees? How much independence does > one working tree have? git-worktree started out as an alternative for git-stash: hmm.. i need to make some changes in another branch, okay let's leave this worktree

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Duy Nguyen
On Wed, Jul 27, 2016 at 6:10 AM, Max Kirillov wrote: > Hi. > > On Wed, Jul 20, 2016 at 07:24:18PM +0200, Nguyễn Thái Ngọc Duy wrote: >> + - `remote.*` added by submodules may be per working directory as >> + well, unless you are sure remotes from all possible submodules in >> + history are con

Re: [PATCH v8 32/41] environment: add set_index_file()

2016-07-27 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 9:28 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Introduce set_index_file() to be able to temporarily change the index file. >> >> It should be used like this: >> >> /* Save current index file */ >> old_index_file = get_index_file(); >> set_index_

Re: [PATCH v4 3/4] submodule: support running in multiple worktree setup

2016-07-27 Thread Duy Nguyen
On Tue, Jul 26, 2016 at 8:15 PM, Stefan Beller wrote: >> How to store stuff in .git is the implementation details that the user >> does not care about. > > They do unfortunately. :( Well.. i mean the structure of .git. If .git gets big, yeah many people will get pissed. > My sudden interest in w

Re: t7063 failure on FreeBSD 10.3 i386/amd64

2016-07-27 Thread Duy Nguyen
On Tue, Jul 19, 2016 at 6:12 PM, Duy Nguyen wrote: > On Tue, Jul 19, 2016 at 12:54 AM, Eric Wong wrote: >> Oops, forgot to Cc some folks who worked on this :x >> >> Filesystem is ufs and it fails regardless of whether >> soft-updates is enabled or not. > > Noth

Find a topic branch containing a commit

2016-07-27 Thread Duy Nguyen
Before I start doing anything silly because I don't know it can already be done without waving my C wand like a mad man... I often do this: find a commit of interest, the commit itself is not enough so I need a full patch series to figure out what's going, so I fire up "git log --graph --oneline"

Re: Find a topic branch containing a commit

2016-07-27 Thread Duy Nguyen
On Wed, Jul 27, 2016 at 8:02 PM, Stefan Beller wrote: > On Wed, Jul 27, 2016 at 10:50 AM, Stefan Beller wrote: >>> >>> PS. Sometimes I wish we could optionally save cover letter in the >>> merge commit. Sometimes the "big plan" is hard to see by reading >>> individual commit messages. >>> -- > >

Re: Find a topic branch containing a commit

2016-07-27 Thread Duy Nguyen
On Wed, Jul 27, 2016 at 7:50 PM, Stefan Beller wrote: > On Wed, Jul 27, 2016 at 10:42 AM, Duy Nguyen wrote: >> Before I start doing anything silly because I don't know it can >> already be done without waving my C wand like a mad man... >> >> I often do this

Re: [PATCH/RFC 0/7] Add possibility to clone specific subdirectories

2016-07-28 Thread Duy Nguyen
On Thu, Jul 28, 2016 at 6:02 PM, Robin Ruede wrote: > This patch series adds a `--sparse-prefix=` option to multiple commands, > allowing fetching repository contents from only a subdirectory of a remote. > > This works along with sparse-checkout, and is especially useful for > repositories > whe

Re: [PATCH/RFC 0/7] Add possibility to clone specific subdirectories

2016-07-28 Thread Duy Nguyen
Corrections.. On Thu, Jul 28, 2016 at 6:59 PM, Duy Nguyen wrote: > Ah.. this is what I call narrow checkout [1] (but gmane is down at the moment) s/checkout/clone/ > [2] https://github.com/pclouds/git/commits/lanh/narrow-checkout s,lanh/,, -- Duy -- To unsubscribe from this list: se

Re: Alternatives to mid.gmane.org?

2016-07-28 Thread Duy Nguyen
On Thu, Jul 28, 2016 at 11:11 AM, Lars Schneider wrote: > Hi, > > gmane is down I read this and thought "temporarily" but apparently it's not [1]. A lot of our links in the mail archive are gmane's :( [1] https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/ -- Duy -- To unsubscribe from th

Re: [PATCH v8 32/41] environment: add set_index_file()

2016-07-29 Thread Duy Nguyen
On Fri, Jul 29, 2016 at 4:21 PM, Christian Couder wrote: >> I agree we should avoid this. There's a bunch of cache_name_pos() (and >> even read_cache()) in the libified apply.c, those will need to be >> converted to take struct index_state* directly (read_index_from or >> index_name_pos). > > The

Re: [PATCH/RFC 0/7] Add possibility to clone specific subdirectories

2016-07-29 Thread Duy Nguyen
On Thu, Jul 28, 2016 at 10:33 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >>> 4. Fsck complains about missing blobs. Should be fairly easy to fix. >> >> Not really. You'll have to associate path information with blobs >> before you decide that a blob

Re: [PATCH v8 32/41] environment: add set_index_file()

2016-07-29 Thread Duy Nguyen
On Fri, Jul 29, 2016 at 8:23 PM, Christian Couder wrote: > On Fri, Jul 29, 2016 at 5:34 PM, Duy Nguyen wrote: >> >> Yeah. If the libification movement is going strong, we can start >> converting and at some point should be able to define >> NO_THE_INDEX_COMPATIBILITY

Re: t7063 failure on FreeBSD 10.3 i386/amd64

2016-07-30 Thread Duy Nguyen
On Wed, Jul 27, 2016 at 07:33:17PM +0200, Duy Nguyen wrote: > On Tue, Jul 19, 2016 at 6:12 PM, Duy Nguyen wrote: > > On Tue, Jul 19, 2016 at 12:54 AM, Eric Wong wrote: > >> Oops, forgot to Cc some folks who worked on this :x > >> > >> Filesystem is uf

Re: t7063 failure on FreeBSD 10.3 i386/amd64

2016-07-30 Thread Duy Nguyen
On Sat, Jul 30, 2016 at 3:31 PM, Duy Nguyen wrote: > I give up. I lied. Sleeping 30 seconds in that test case works, but there is no way I'm sending a patch to delay 30 seconds. FreeBSD must have some delayed mtime update "feature" in its vfs layer somewhere. Now I give

Re: [PATCH] t7063: work around FreeBSD's lazy mtime update feature

2016-07-31 Thread Duy Nguyen
On Sun, Jul 31, 2016 at 3:07 AM, Eric Wong wrote: >> would be more to the point of what is going on, here. But I >> also wonder if untracked cache itself could/should be doing this >> internally. > > Still wondering :> There's nothing we can do besides maybe run a cron job executing 'sync' ever

Re: [PATCH] t7063: work around FreeBSD's lazy mtime update feature

2016-08-01 Thread Duy Nguyen
On Mon, Aug 1, 2016 at 3:37 AM, Torstem Bögershausen wrote: > the term FREEBSD may be too generic to point out a single feature > in an OS distributution. > Following your investigations, it may even be possible that > other systems adapt this "feature"? > > How about > LAZY_DIR_MTIME_UPDATE > (or

Re: [PATCH 1/2] pager: move pager-specific setup into the build

2016-08-01 Thread Duy Nguyen
On Mon, Aug 1, 2016 at 3:05 AM, Eric Wong wrote: > From: Junio C Hamano > > Allowing PAGER_ENV to be set at build-time allows us to move > pager-specific knowledge out of our build. Currently, this > allows us to set a better default for FreeBSD where more(1) > is the same binary as less(1). Ni

Re: [PATCH 1/2] pager: move pager-specific setup into the build

2016-08-01 Thread Duy Nguyen
On Mon, Aug 1, 2016 at 7:52 PM, Jeff King wrote: > On Mon, Aug 01, 2016 at 07:46:34PM +0200, Duy Nguyen wrote: > >> On Mon, Aug 1, 2016 at 3:05 AM, Eric Wong wrote: >> > From: Junio C Hamano >> > >> > Allowing PAGER_ENV to be set at build-time allows us to

Re: [PATCH] t7063: work around FreeBSD's lazy mtime update feature

2016-08-02 Thread Duy Nguyen
On Mon, Aug 01, 2016 at 02:04:44PM -0700, Junio C Hamano wrote: > Duy Nguyen writes: > > > On Mon, Aug 1, 2016 at 3:37 AM, Torstem Bögershausen wrote: > >> the term FREEBSD may be too generic to point out a single feature > >> in an OS distributution. > >>

Re: [PATCH v2] t7063: work around FreeBSD's lazy mtime update feature

2016-08-03 Thread Duy Nguyen
On Wed, Aug 3, 2016 at 6:16 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> v2 goes with Junio's suggestion (good one!). > > Ehh, have you even read what you copied and pasted? "this and that" > and "blah" are meant to be placeholders for you to fill in. I did. But after a bit o

Re: [PATCH v3] t7063: work around FreeBSD's lazy mtime update feature

2016-08-04 Thread Duy Nguyen
On Wed, Aug 3, 2016 at 9:07 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> If you mean to tell the user "I won't describe it in detail, if you >> really want to know, >> go run blame yourself", spell it out like so. I was hoping that you >> can summarize >> in-line there to help the read

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-05 Thread Duy Nguyen
On Wed, Aug 3, 2016 at 6:07 PM, Johannes Schindelin wrote: > It would be a totally different matter, of course, if you used the > branches I publish via my GitHub repository, added fixup! and squash! > commits, published the result to a public repository and then told me to > pull from there, that

Re: [ANNOUNCE] more archives of this list

2016-08-05 Thread Duy Nguyen
On Fri, Aug 5, 2016 at 11:28 AM, Jeff King wrote: > There was discussion a long time ago about storing a common zlib > dictionary in the packfile and using it for all of the objects. I don't > recall whether there were any patches, though. It does create some > complications with serving clones/fe

Re: storing cover letter of a patch series?

2016-08-07 Thread Duy Nguyen
On Sun, Aug 7, 2016 at 7:12 AM, Michael S. Tsirkin wrote: > On Fri, Aug 05, 2016 at 08:39:58AM -0700, Junio C Hamano wrote: >> "Michael S. Tsirkin" writes: >> >> > On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote: >> >> The problem with "empty commit trick" is that it is a commit wh

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-08 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 12:20 AM, Michael Haggerty wrote: > On 08/04/2016 05:58 PM, Johannes Schindelin wrote: >> [...] >> Even requiring every contributor to register with GitHub would be too much >> of a limitation, I would wager. >> [...] > > Is it *really* so insane to consider moving collabora

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 1:20 AM, Michael Haggerty wrote: > Could you elaborate why you would expect quality and/or quantity of > reviews to suffer? I'm really curious, and I'd be happy to pass your > feedback along to my colleagues. Since I have been using github at work for a couple months, I do

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 8:36 PM, Duy Nguyen wrote: > On Tue, Aug 9, 2016 at 1:20 AM, Michael Haggerty wrote: >> Could you elaborate why you would expect quality and/or quantity of >> reviews to suffer? I'm really curious, and I'd be happy to pass your >> feedback al

Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

2016-08-09 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 1:37 PM, Jeff King wrote: >That's (relatively) easy for me to script via mutt (grab >these patches, apply them). Could you share your mutt set up pleaaase? I've been wanting this for a long time, but never used mutt long enough to bother with a proper setup like thi

Re: [PATCH] Speed up sparse checkout when $GIT_DIR/info/sparse-checkout is unchanged

2016-08-13 Thread Duy Nguyen
Ping.. On Tue, Jul 12, 2016 at 1:15 AM, Nguyễn Thái Ngọc Duy wrote: > When a "tree unpacking" operation is needed, which is part of > switching branches using "git checkout", the following happens in a > sparse checkout: > > 1) Run all existing entries through $GIT_DIR/info/sparse-checkout, >

Re: [PATCH v4] config: add conditional include

2016-08-13 Thread Duy Nguyen
Ping.. On Thu, Jul 14, 2016 at 10:33 PM, Nguyễn Thái Ngọc Duy wrote: > Helped-by: Jeff King > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > The diff from v3 is mostly clarification in code and document. > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 18623ee.

Re: storing cover letter of a patch series?

2016-08-13 Thread Duy Nguyen
On Tue, Aug 9, 2016 at 12:27 AM, Stefan Beller wrote: > On Thu, Sep 10, 2015 at 9:28 AM, Jacob Keller wrote: >> Hey, >> >> does anyone know of any tricks for storing a cover letter for a patch >> series inside of git somehow? I'd guess the only obvious way currently >> is to store it at the top o

Re: storing cover letter of a patch series?

2016-08-15 Thread Duy Nguyen
On Mon, Aug 15, 2016 at 1:28 PM, Stefan Beller wrote: > On Sun, Aug 14, 2016 at 12:15 AM, Jacob Keller wrote: >> On Sat, Aug 13, 2016 at 1:49 AM, Duy Nguyen wrote: >>> On Tue, Aug 9, 2016 at 12:27 AM, Stefan Beller wrote: >>>> is what you want. Maybe we wan

Re: storing cover letter of a patch series?

2016-08-15 Thread Duy Nguyen
On Mon, Aug 15, 2016 at 7:37 PM, Philip Oakley wrote: > I appreciate there has been a lot of discussion, but it mainly appears to be > about an upstream / integration viewpoint. > > I'd hate it if there was a one size fits all solution that was only focused > on one important use case, rather than

Re: storing cover letter of a patch series?

2016-08-15 Thread Duy Nguyen
On Tue, Aug 16, 2016 at 3:46 AM, Philip Oakley wrote: > From: "Jacob Keller" > [nip] >>> >>> >>> I've no problem with more extensive methods for those preparing very big >>> patch series, or with those needing to merge together a lot of series and >>> want to keep the cover letters, but ensuring

Re: storing cover letter of a patch series?

2016-08-15 Thread Duy Nguyen
On Tue, Aug 16, 2016 at 12:26 PM, Jacob Keller wrote: >>> They can just add "squash! cover! " commits for that ;-) Though more >>> likely the advanced workflow would be used... We'll need both (more than >>> one) options. >> >> Or even better, "git commit --reword $SHA1" brings up the editor with

Re: What's cooking in git.git (Aug 2016, #06; Sun, 14)

2016-08-17 Thread Duy Nguyen
On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote: > * dt/index-helper (2016-07-06) 21 commits > > A new "index-helper" daemon has been introduced to give newly > spawned Git process a quicker access to the data in the index, and > optionally interface with the watchman daemon to further re

Re: [PATCH v4] config: add conditional include

2016-08-22 Thread Duy Nguyen
On Sun, Aug 21, 2016 at 4:08 AM, Jakub Narębski wrote: > W dniu 19.08.2016 o 15:54, Jeff King pisze: >> On Sat, Aug 13, 2016 at 03:40:59PM +0700, Duy Nguyen wrote: >> >>> Ping.. >> >> There was some discussion after v4. I think the open issues are: >> >

Re: [PATCH v4] config: add conditional include

2016-08-22 Thread Duy Nguyen
On Mon, Aug 22, 2016 at 7:59 PM, Matthieu Moy wrote: > Duy Nguyen writes: > >> On Sun, Aug 21, 2016 at 4:08 AM, Jakub Narębski wrote: >>> W dniu 19.08.2016 o 15:54, Jeff King pisze: >>>> On Sat, Aug 13, 2016 at 03:40:59PM +0700, Duy Nguyen wrote: >>&

Re: Working with public-inbox.org [Was: [PATCH] rev-parse: respect core.hooksPath in --git-path]

2016-08-22 Thread Duy Nguyen
On Mon, Aug 22, 2016 at 8:06 PM, Johannes Schindelin wrote: > My point stands. We are way more uninviting to contributors than > necessary. And a huge part of the problem is that we require contributors > to send their patches inlined into whitespace-preserving mails. We probably can settle this

Re: [PATCH v4] config: add conditional include

2016-08-22 Thread Duy Nguyen
On Mon, Aug 22, 2016 at 8:22 PM, Matthieu Moy wrote: >>> I think the syntax should be design to allow arbitrary boolean >>> expression later if needed. >> >> I would be against that. We may extend it more in future, but it >> should be under control, not full boolean expressions. > > Why? > > I'm

Re: [git-for-windows] Re: [ANNOUNCE] Git for Windows 2.9.3

2016-08-22 Thread Duy Nguyen
On Thu, Aug 18, 2016 at 3:37 PM, Johannes Schindelin wrote: > Hi Junio, > > On Wed, 17 Aug 2016, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> >> And then your "git cat-file" patch can be upstreamed with the option >> >> renamed to (or with an additional synonym) "--filters", which

Re: Bug with git worktrees and git init

2016-08-24 Thread Duy Nguyen
On Tue, Aug 23, 2016 at 10:21 PM, Michael J Gruber wrote: > I've cc'ed the master of worktrees. Thanks for the analysis. I'll provide some patch as soon as possible. This git-init may also be a good place to repair broken worktrees too (e.g. because you moved a worktree manually).. PS. Master? W

Re: [PATCH v4] config: add conditional include

2016-08-24 Thread Duy Nguyen
On Tue, Aug 23, 2016 at 8:42 PM, Johannes Schindelin wrote: > Hi Duy, > > On Mon, 22 Aug 2016, Duy Nguyen wrote: > >> On Mon, Aug 22, 2016 at 8:22 PM, Matthieu Moy >> wrote: >> >>> I think the syntax should be design to allow arbitrary boolean >>

Re: [PATCH] checkout: swap the order of ambiguity check for :/ syntax

2016-08-25 Thread Duy Nguyen
On Wed, Aug 24, 2016 at 11:35 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> It's not wonderful, but it's in line with how git-checkout stops caring >> about ambiguity after the first argument can be resolved as a ref >> (there's even a test for it, t2010.6). > > But that is justi

Re: [PATCH] checkout: swap the order of ambiguity check for :/ syntax

2016-08-26 Thread Duy Nguyen
On Fri, Aug 26, 2016 at 12:19 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Wed, Aug 24, 2016 at 11:35 PM, Junio C Hamano wrote: >>> Nguyễn Thái Ngọc Duy writes: >>> >>>> It's not wonderful, but it's in line with how git-checko

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-07 Thread Duy Nguyen
On Tue, Nov 8, 2016 at 4:15 AM, Jeff King wrote: > On Mon, Nov 07, 2016 at 04:10:10PM -0500, Jeff King wrote: > >> And I'll admit my main motivation is not that index/filesystem parity, >> but rather just that: >> >> git clone git://host.com/malicious-repo.git >> git log >> >> might create and

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-09 Thread Duy Nguyen
On Wed, Nov 9, 2016 at 5:21 AM, Jeff King wrote: > On Tue, Nov 08, 2016 at 08:38:55AM +0700, Duy Nguyen wrote: > >> > Another approach is to have a config option to disallow symlinks to >> > destinations outside of the repository tree (I'm not sure if it should

Re: [PATCH v1 03/19] split-index: add {add,remove}_split_index() functions

2016-11-09 Thread Duy Nguyen
On Mon, Nov 7, 2016 at 5:08 PM, Duy Nguyen wrote: > On Sun, Oct 30, 2016 at 5:06 AM, Christian Couder > wrote: >> On Tue, Oct 25, 2016 at 11:58 AM, Duy Nguyen wrote: >>> On Sun, Oct 23, 2016 at 4:26 PM, Christian Couder >>> wrote: >>>> +void rem

Re: [PATCH 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Duy Nguyen
On Fri, Oct 28, 2016 at 1:29 AM, Junio C Hamano wrote: > The reason why I am bringing this up in this discussion thread on > this patch is because I wonder if we would benefit by a similar > "let's not do too involved things and be cheap by erring on the safe > and lazy side" strategy in the call

Re: [PATCHv2 32/36] pathspec: allow querying for attributes

2016-11-09 Thread Duy Nguyen
On Sat, Oct 29, 2016 at 1:54 AM, Stefan Beller wrote: > The pathspec mechanism is extended via the new > ":(attr:eol=input)pattern/to/match" syntax to filter paths so that it > requires paths to not just match the given pattern but also have the > specified attrs attached for them to be chosen. >

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

2016-11-10 Thread Duy Nguyen
On Thu, Nov 10, 2016 at 7:23 AM, Jeff King wrote: > On Wed, Nov 09, 2016 at 04:18:29PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > On Wed, Nov 09, 2016 at 02:58:37PM -0800, Junio C Hamano wrote: >> > >> > I'm slightly confused. Did you mean "supporting any in-tree symlink to >> >

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

2016-11-10 Thread Duy Nguyen
On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> --- >> v2 changes just the subject line > > That's not sufficient, is it? What you did in the documentation > would raise the same "Hmph, is this only about HEAD?" and unlike the > commit subject, it wil

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

2016-11-10 Thread Duy Nguyen
On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen wrote: > On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> --- >>> v2 changes just the subject line >> >> That's not sufficient, is it? What you did in t

Re: [PATCH] doc: fix location of 'info/' with $GIT_COMMON_DIR

2016-11-11 Thread Duy Nguyen
On Fri, Nov 11, 2016 at 6:23 PM, Patrick Steinhardt wrote: > With the introduction of the $GIT_COMMON_DIR variable, the > repository layout manual was changed to reflect the location for > many files in case the variable is set. While adding the new > locations, one typo snuck in regarding the loc

Re: [PATCH 00/11] git worktree (re)move

2016-11-16 Thread Duy Nguyen
On Sat, Nov 12, 2016 at 06:53:44PM -0800, Junio C Hamano wrote: > not ok 12 - move worktree > # > # git worktree move source destination && > # test_path_is_missing source && > # git worktree list --porcelain | grep "^worktree" >actual && > # cat

Re: [PATCH 00/11] git worktree (re)move

2016-11-16 Thread Duy Nguyen
On Wed, Nov 16, 2016 at 8:05 PM, Duy Nguyen wrote: > diff --git a/worktree.c b/worktree.c > index f7869f8..fe92d6f 100644 > --- a/worktree.c > +++ b/worktree.c > @@ -173,6 +173,13 @@ static void mark_current_worktree(struct worktree > **worktrees) > free(git_dir);

Re: [PATCH] worktree: fix a sparse 'Using plain integer as NULL pointer' warning

2016-11-16 Thread Duy Nguyen
On Wed, Nov 16, 2016 at 3:28 AM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Duy, > > If you need to re-roll your 'nd/worktree-move' branch, could you > please squash this into the relevant patch [commit c49e92f5c > ("worktree move: refuse to move worktrees with submodules",

Re: [RFH] limiting ref advertisements

2016-11-16 Thread Duy Nguyen
On Tue, Nov 15, 2016 at 4:21 AM, Jeff King wrote: > Thanks for responding to this. Glad to help (or more precisely annoy you somewhat :D) > I've been meaning to get back to it with > some code experiments, but they keep getting bumped down in priority. So > let me at least outline some of my tho

Re: [PATCH 2/3] stripspace: respect repository config

2016-11-22 Thread Duy Nguyen
On Mon, Nov 21, 2016 at 9:18 PM, Johannes Schindelin wrote: > When eff80a9 (Allow custom "comment char", 2013-01-16) taught the > `stripspace` command to respect the config setting `core.commentChar`, > it forgot that this variable may be defined in .git/config. > > So when rebasing interactively

Re: [PATCH 3/3] rebase -i: handle core.commentChar=auto

2016-11-22 Thread Duy Nguyen
On Mon, Nov 21, 2016 at 9:18 PM, Johannes Schindelin wrote: > When 84c9dc2 (commit: allow core.commentChar=auto for character auto > selection, 2014-05-17) extended the core.commentChar functionality to > allow for the value 'auto', it forgot that rebase -i was already taught to > handle core.comm

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

2016-11-22 Thread Duy Nguyen
On Fri, Nov 18, 2016 at 9:34 PM, Christian Couder wrote: > On Mon, Nov 7, 2016 at 10:38 AM, Duy Nguyen wrote: >> (sorry I got sick in the last few weeks and could not respond to this >> earlier) > > (Yeah, I have also been sick during the last few weeks.) > >>

Re: [PATCH 31/35] pathspec: allow querying for attributes

2016-11-22 Thread Duy Nguyen
On Fri, Nov 11, 2016 at 3:34 AM, Stefan Beller wrote: > @@ -139,7 +140,8 @@ static size_t common_prefix_len(const struct pathspec > *pathspec) >PATHSPEC_LITERAL | >PATHSPEC_GLOB | >PATHSPEC_ICASE | > - PA

Re: [PATCH v1 12/19] Documentation/config: add splitIndex.maxPercentChange

2016-11-22 Thread Duy Nguyen
On Tue, Nov 22, 2016 at 8:13 PM, Christian Couder wrote: > So if we now mix things up just to avoid one more configuration > option, we could very well make things harder to develop, to > configure, to parse and to understand later, so it is not a trade off > worth making. OK since we're still in

Re: [PATCH 31/35] pathspec: allow querying for attributes

2016-11-23 Thread Duy Nguyen
On Wed, Nov 23, 2016 at 12:26 AM, Stefan Beller wrote: > On Tue, Nov 22, 2016 at 2:41 AM, Duy Nguyen wrote: >> On Fri, Nov 11, 2016 at 3:34 AM, Stefan Beller wrote: >>> @@ -139,7 +140,8 @@ static size_t common_prefix_len(const struct paths

Re: [PATCH] merge-recursive.c: use QSORT macro

2016-11-23 Thread Duy Nguyen
On Wed, Nov 23, 2016 at 12:49 AM, Jeff King wrote: > On Tue, Nov 22, 2016 at 07:30:19PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> This is the follow up of rs/qsort series, merged in b8688ad (Merge >> branch 'rs/qsort' - 2016-10-10), where coccinelle was used to do >> automatic transformation. >> >>

Re: dangling commits in worktree

2016-11-23 Thread Duy Nguyen
On Wed, Nov 23, 2016 at 7:52 AM, Van Oostenryck Luc wrote: > Hi, > > More or less by error I used the fsck command in a worktree and I had > the surprised to see that it reported a lot of dangling commits while it was > not supposed to have one. > I quickly realized that it was the case only in th

Re: [PATCH v2] merge-recursive.c: use string_list_sort instead of qsort

2016-11-25 Thread Duy Nguyen
On Fri, Nov 25, 2016 at 3:52 AM, Jeff King wrote: > On Thu, Nov 24, 2016 at 06:45:36PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> This started out to as a hunt for remaining qsort() calls after rs/qsort >> series because qsort() API is a bit easy to get wrong (*). However, >> since we have string_lis

Re: [PATCH 3/3] worktree list: keep the list sorted

2016-11-25 Thread Duy Nguyen
On Thu, Nov 24, 2016 at 12:16 AM, Junio C Hamano wrote: > More importantly, perhaps get_worktrees() should learn to take an > optional pointer to int that returns how many items are in the list? My first thought was "yeah I remember there are many counting loop like this" then grepped and realize

Re: [PATCH 0/3] Minor fixes on 'git worktree'

2016-11-25 Thread Duy Nguyen
On Wed, Nov 23, 2016 at 11:52 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> This fixes two things: >> >> - make sure the first item is always the main worktree even if we >>fail to retrieve some info >> >> - keep 'worktree list' order stable (which in turn fixes the random

Re: [PATCH 0/3] Minor fixes on 'git worktree'

2016-11-25 Thread Duy Nguyen
On Fri, Nov 25, 2016 at 7:24 PM, Duy Nguyen wrote: > Adding the test for the failed parse_ref() is possible, I think. But > since that function is destined to die, as I promised to use > refs-provided api instead of rolling out a custom ref parser, and I'm > going to have ano

Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)

2016-11-26 Thread Duy Nguyen
On Thu, Nov 24, 2016 at 6:21 AM, Junio C Hamano wrote: > * nd/rebase-forget (2016-10-28) 1 commit > - rebase: add --forget to cleanup rebase, leave HEAD untouched > > "git rebase" learned "--forget" option, which allows a user to > remove the metadata left by an earlier "git rebase" that was >

Re: [PATCH v2 00/11] git worktree (re)move

2016-11-29 Thread Duy Nguyen
On Tue, Nov 29, 2016 at 3:20 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Does this round address the issue raised in >> >> http://public-inbox.org/git/alpine.DEB.2.20.1611161041040.3746@virtualbox >> >> by Dscho? It does not (and is sort of expected), quoting from the commit messag

Re: [PATCH v2 00/11] git worktree (re)move

2016-11-29 Thread Duy Nguyen
On Tue, Nov 29, 2016 at 4:25 AM, Johannes Sixt wrote: > Am 28.11.2016 um 21:20 schrieb Junio C Hamano: >> >> Junio C Hamano writes: >> >>> Does this round address the issue raised in >>> >>> >>> http://public-inbox.org/git/alpine.DEB.2.20.1611161041040.3746@virtualbox >>> >>> by Dscho? >>> >>> Ev

Re: [PATCH v2 00/11] git worktree (re)move

2016-11-29 Thread Duy Nguyen
On Tue, Nov 29, 2016 at 07:08:16PM +0700, Duy Nguyen wrote: > On Tue, Nov 29, 2016 at 3:20 AM, Junio C Hamano wrote: > > Junio C Hamano writes: > > > >> Does this round address the issue raised in > >> > >> http://public-inbox.org/git/alpine.DEB.2.20.

Re: [PATCH v2 00/11] git worktree (re)move

2016-11-29 Thread Duy Nguyen
On Wed, Nov 30, 2016 at 4:14 AM, Johannes Sixt wrote: >> diff --git a/copy.c b/copy.c >> index 4de6a11..b232aec 100644 >> --- a/copy.c >> +++ b/copy.c >> @@ -65,3 +65,9 @@ int copy_file_with_time(const char *dst, const char >> *src, int mode) >> return copy_times(dst, src); >>

Re: [PATCHv2 4/4] submodule: add embed-git-dir function

2016-11-30 Thread Duy Nguyen
On Wed, Nov 23, 2016 at 2:22 AM, Stefan Beller wrote: > +/* > + * Migrate the given submodule (and all its submodules recursively) from > + * having its git directory within the working tree to the git dir nested > + * in its superprojects git dir under modules/. > + */ > +void migrate_submodule_g

Re: [PATCH 1/4] shallow.c: make paint_alloc slightly more robust

2016-12-05 Thread Duy Nguyen
On Sat, Dec 3, 2016 at 12:14 PM, Jeff King wrote: > On Fri, Dec 02, 2016 at 09:31:01PM +0100, Rasmus Villemoes wrote: > >> I have no idea if this is a real issue, but it's not obvious to me that >> paint_alloc cannot be called with info->nr_bits greater than about >> 4M (\approx 8*COMMIT_SLAB_SIZE

<    5   6   7   8   9   10   11   12   13   14   >