Re: [PATCH v6 23/27] switch: reject if some operation is in progress

2019-04-29 Thread Duy Nguyen
On Thu, Apr 25, 2019 at 5:33 PM Phillip Wood wrote: > > On 29/03/2019 10:39, Nguyễn Thái Ngọc Duy wrote: > > Unless you know what you're doing, switching to another branch to do > > something then switching back could be confusing. Worse, you may even > > forget that you're in the middle of someth

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-29 Thread Duy Nguyen
On Mon, Apr 29, 2019 at 6:03 PM Aleksey Midenkov wrote: > > Reproduce: > ``` > cat << EOF >> /tmp/check.sh > #!/bin/sh > git log HEAD~..HEAD | cat > # sleep 1 > EOF > chmod +x /tmp/check.sh > git rebase -p -x /tmp/check.sh base > ``` > If the `base` is far away enough it fails with "fatal: Unable

Re: [PATCH v2 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

2019-04-29 Thread Duy Nguyen
On Tue, Apr 30, 2019 at 8:02 AM Johannes Schindelin wrote: > > Hi Duy, > > On Sun, 24 Mar 2019, Nguyễn Thái Ngọc Duy wrote: > > > While at there, move exit() back to the caller. It's easier to see the > > flow that way than burying it in diff-no-index.c > > I just noticed that this commit message

Re: [PATCH v2 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 5:12 AM Johannes Schindelin wrote:> > Hi Duy, > > On Tue, 30 Apr 2019, Duy Nguyen wrote: > > > On Tue, Apr 30, 2019 at 8:02 AM Johannes Schindelin > > wrote: > > > > > > Hi Duy, > > > > > > On Sun, 24 Mar 2019,

Re: [PATCH 3/6] config.c: add repo_config_set_worktree_gently()

2019-05-01 Thread Duy Nguyen
On Tue, Apr 30, 2019 at 11:40 PM Derrick Stolee wrote: > > On 12/27/2018 10:56 AM, Nguyễn Thái Ngọc Duy wrote: > > diff --git a/config.h b/config.h > > index ee5d3fa7b4..62204dc252 100644 > > --- a/config.h > > +++ b/config.h > > @@ -103,6 +103,9 @@ extern int git_config_color(char *, const char *

Re: Contributing with documentation/translation

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 1:10 AM Priscila Gutierres wrote: > > Hi > I want to contribute to git by creating and/or translating > documentation. Where may I find the info to do this? For translation, you could start at po/README. That's mostly UI translation. I think some team actually started docum

Re: [PATCH 1/2] read-tree --reset: add --protect-untracked

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote: > diff --git a/unpack-trees.h b/unpack-trees.h > index d344d7d296..732b262c4d 100644 > --- a/unpack-trees.h > +++ b/unpack-trees.h > @@ -41,9 +41,15 @@ void setup_unpack_trees_porcelain(struct > unpack_trees_options *opts, > */ > void clear_un

Re: [PATCH 0/2] read-tree: improve untracked file support

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote: > > From: Phillip Wood > > These two patches teach read-tree how to avoid overwriting untracked > files when doing '--reset -u' and also how to respect all of git's > standard excludes files. I'd like to see the porcelain commands stop > overwrit

Re: [PATCH 1/2] read-tree --reset: add --protect-untracked

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 5:18 PM Duy Nguyen wrote: > > On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote: > > diff --git a/unpack-trees.h b/unpack-trees.h > > index d344d7d296..732b262c4d 100644 > > --- a/unpack-trees.h > > +++ b/unpack-trees

Re: How to undo previously set configuration? (again)

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 4:14 AM Jeff King wrote: > It's definitely not implemented universally; each consumer of the config > option must decide on it (and it will probably always be that way to > some degree, since we don't know the semantics of each options; recall > that we may be holding config

Re: How to undo previously set configuration? (again)

2019-05-01 Thread Duy Nguyen
On Wed, May 1, 2019 at 7:18 PM Ævar Arnfjörð Bjarmason wrote: > > > On Wed, May 01 2019, Duy Nguyen wrote: > > > On Wed, May 1, 2019 at 4:14 AM Jeff King wrote: > >> It's definitely not implemented universally; each consumer of the config > >> optio

Re: [PATCH 1/2] read-tree --reset: add --protect-untracked

2019-05-02 Thread Duy Nguyen
On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote: > > From: Phillip Wood > > Currently there is no way to get git to discard changes to the > worktree without overwriting untracked files. `reset --hard`, > `checkout --force`, `checkout :/` and `read-tree --reset -u` "checkout :/" does not use

Re: [PATCH 0/2] read-tree: improve untracked file support

2019-05-02 Thread Duy Nguyen
On Wed, May 1, 2019 at 9:58 PM Phillip Wood wrote: > > > > On 01/05/2019 11:31, Duy Nguyen wrote: > > On Wed, May 1, 2019 at 5:14 PM Phillip Wood > > wrote: > >> > >> From: Phillip Wood > >> > >> These two patches teach read-t

Re: "git branch -f" corrupt other worktree

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 6:59 PM frank kulow wrote: > > git version 2.21.0.windows.1 > > > /c/tmp/gt (Branch_702091a0) > $ git worktree add ../wt master > Preparing worktree (checking out 'master') > HEAD is now at f534c32 4 > > > /c/tmp/gt (Branch_702091a0) > $ git branch -D master > error: Cannot

Re: "git branch -f" corrupt other worktree

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 7:51 PM Ævar Arnfjörð Bjarmason wrote: > > > On Thu, May 02 2019, Duy Nguyen wrote: > > > On Thu, May 2, 2019 at 6:59 PM frank kulow wrote: > >> > >> git version 2.21.0.windows.1 > >> > >> > /c/tmp/gt (Branch_7020

Re: "git branch -f" corrupt other worktree

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 8:05 PM Duy Nguyen wrote: > > Part of this is "doctor, it hurts when I stab my eye" :) but I wonder in > > general whether users are more likely to expect different worktrees to > > have different views of the refstore, since they way they&#x

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 10:45 PM Phillip Wood wrote: > > Hi wh > > On 14/04/2019 02:59, wh wrote: > > Thanks for the info about the upcoming "precious" attribute. Looks useful. > > > > I didn't get the impression that Git normally overwrites ignored > > files. Please do not include me in these dis

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 10:07 PM Jeff King wrote: > > On Thu, May 02, 2019 at 04:45:36PM +0300, Aleksey Midenkov wrote: > > > > Assuming that kdevelop is just running "git status" in the background, > > > though, there's an easier solution. If it uses "git --no-optional-locks > > > status" instead,

Re: "git branch -f" corrupt other worktree

2019-05-02 Thread Duy Nguyen
On Thu, May 02, 2019 at 08:05:57PM +0700, Duy Nguyen wrote: > The difficulty will be coming up with some sane UI that can > handle that and not leave too many traps behind. I can't see that UI. Well, I'm still thinking about it. And perhaps a good UI is not that far away. The

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 11:58 PM Jeff King wrote: > > I might take a stab at the "wait and try to hold the lock again, doing > > necessary verification after if needed" idea. It sounds like the right > > way to go and we haven't had problems with refs doing the same thing > > (have we?). > > No, bu

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 11:58 PM Jeff King wrote: > > I might take a stab at the "wait and try to hold the lock again, doing > > necessary verification after if needed" idea. It sounds like the right > > way to go and we haven't had problems with refs doing the same thing > > (have we?). > > No, bu

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-05-03 Thread Duy Nguyen
On Fri, May 3, 2019 at 4:47 PM Johannes Schindelin wrote: > > Hi Duy, > > On Fri, 3 May 2019, Duy Nguyen wrote: > > > I have a feeling that most operations read the index unlocked, > > manipulate and only lock before writing things out. So yeah it's > > prob

Re: bug: git pull may delete untracked files in submodule without notice

2019-05-03 Thread Duy Nguyen
On Fri, May 3, 2019 at 5:25 PM Christian Spanier wrote: > > Hi, > > I found a bug where Git may delete untracked files without notice in > certain situations. This bug effects Git 2.21.0 both on Linux and Windows. > In summary this happens when git pull merges a commit that replaces a > submodule

Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-05-06 Thread Duy Nguyen
On Thu, Apr 25, 2019 at 8:15 PM Junio C Hamano wrote: > * nd/config-move-to (2019-01-14) 7 commits > - config.h: fix hdr-check warnings > - config: add --move-to > - config: factor out set_config_source_file() > - config: use OPT_FILENAME() > - config.c: add repo_config_set_worktree_gently()

Re: [PATCH] coccicheck: optionally process every source file at once

2019-05-06 Thread Duy Nguyen
On Mon, May 6, 2019 at 12:13 PM Jeff King wrote: > This reduces the time required to run make coccicheck by a significant > amount of time: > > Prior timing of make coccicheck > real6m14.090s > user25m2.606s > sys 1m22.919s > > New timing of make coccicheck > real1m36.580s

Re: [PATCH] coccicheck: optionally batch spatch invocations

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 6:43 AM Jeff King wrote: > > On Mon, May 06, 2019 at 04:34:09PM +0700, Duy Nguyen wrote: > > > > However, it comes at a cost. The RSS of each spatch process goes from > > > ~50MB to ~1500MB (and peak memory usage may be even higher if make runs

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 9:21 AM Emily Shaffer wrote: > I've got a usability comment, as we're giving restore a try within > Google for now. Thanks. I thought I was the only guinea pig :D and obviously not a good one since I know too much (which is not a good thing as a tester). > I found myself i

Re: [PATCH 0/2] read-tree: improve untracked file support

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 5:02 PM Phillip Wood wrote: > > My (biased, obviously) view is that "git reset --hard" is very > > dangerous and I'm not trying to change that, especially when its > > behavior has been like this since forever and I'm sure it's used in > > scripts. > > > > Instead "git resto

Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-05-07 Thread Duy Nguyen
On Tue, May 7, 2019 at 10:43 AM Junio C Hamano wrote: > -- >8 -- > Subject: t0040: protect lines that are indented by spaces > > This block is byte-for-byte identical expected output, that contains a > few lines that are indented in many spaces, which makes "git diff --check" > unhappy and will br

Re: [PATCH v2] git-compat-util: undefine fileno if defined

2019-05-08 Thread Duy Nguyen
On Wed, May 8, 2019 at 2:47 PM Junio C Hamano wrote: > > Dan McGregor writes: > > >>I don't think this is enough. At least fbsd defines this > >> > >>#definefileno(p)(!__isthreaded ? __sfileno(p) : (fileno)(p)) > >> > >>so one of the two functions will be used depending on __isthreaded >

Re: [PATCH v3 00/16] Add new command 'restore'

2019-05-08 Thread Duy Nguyen
On Wed, May 8, 2019 at 1:31 AM Emily Shaffer wrote: > > > I found myself in a situation where I had accidentally > > > staged all my changes to tracked files (I think resulting from a stash > > > pop which generated a merge conflict?) and didn't see a good way to > > > unstage everything using res

Re: [PATCH 01/19] revision.h: avoid bit fields in struct rev_info

2019-05-08 Thread Duy Nguyen
On Wed, May 8, 2019 at 9:07 PM Derrick Stolee wrote: > > On 5/8/2019 7:12 AM, Nguyễn Thái Ngọc Duy wrote: > > Bitfield addresses cannot be passed around in a pointer. This makes it > > hard to use parse-options to set/unset them. Turn this struct to > > normal integers. This of course increases th

Re: [PATCH 01/19] revision.h: avoid bit fields in struct rev_info

2019-05-09 Thread Duy Nguyen
On Wed, May 8, 2019 at 10:52 PM Derrick Stolee wrote: > > On 5/8/2019 10:41 AM, Duy Nguyen wrote: > > On Wed, May 8, 2019 at 9:07 PM Derrick Stolee wrote: > >> > >> On 5/8/2019 7:12 AM, Nguyễn Thái Ngọc Duy wrote: > >>> Bitfield addresses cannot be

Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-09 Thread Duy Nguyen
On Thu, May 9, 2019 at 12:23 AM Junio C Hamano wrote: > > * nd/merge-quit (2019-05-07) 2 commits > - merge: add --quit > - merge: remove drop_save() in favor of remove_merge_branch_state() > > "git merge" learned "--quit" option that cleans up the in-progress > merge while leaving the working

Re: nd/merge-quit, was Re: What's cooking in git.git (May 2019, #01; Thu, 9)

2019-05-10 Thread Duy Nguyen
On Fri, May 10, 2019 at 3:54 AM Johannes Schindelin wrote: > > Hi Junio & Duy, > > On Thu, 9 May 2019, Junio C Hamano wrote: > > > * nd/merge-quit (2019-05-07) 2 commits > > - merge: add --quit > > - merge: remove drop_save() in favor of remove_merge_branch_state() > > > > "git merge" learned "

Re: config file not being copied from templates folder

2019-05-10 Thread Duy Nguyen
On Fri, May 10, 2019 at 2:07 AM Jack Zylkin wrote: > > The “git init” documentation for the “Template Directory” states that: > > > “Files and directories in the template directory whose name do not > start with a dot will be copied to the $GIT_DIR after it is created.” > > > However, I put a file

Re: new segfault in master (6a6c0f10a70a6eb1)

2019-05-11 Thread Duy Nguyen
On Sun, May 12, 2019 at 6:02 AM Jeff King wrote: > > On Sat, May 11, 2019 at 06:31:20PM -0400, Jeff King wrote: > > > On Sat, May 11, 2019 at 08:57:11PM +, Eric Wong wrote: > > > > > This test-tool submodule segfault seems new. Noticed it while > > > checking dmesg for other things. > > > > Y

Re: "add worktree" fails with "fatal: Invalid path" error

2019-05-13 Thread Duy Nguyen
On Sun, May 12, 2019 at 5:14 PM Shaheed Haque wrote: > > Hi, > > I'm running git v.2.20.1 on Ubuntu from a program which follows the pattern: > > > 1. create a temporary directory /tmp/tmpabc When is this directory deleted? After step 3a? > 2. in a loop: > 2a. create a second le

Is git-checkout's restoring d/f conflict really sane?

2019-05-14 Thread Duy Nguyen
$ echo data > one $ git add one $ rm one $ mkdir one $ echo two > one/two $ echo three > one/three $ git checkout one $ ls -l one -rw-r--r-- 1 pclouds pclouds 5 May 14 16:36 one Replacing a file is one thing. In this case we're deleting a directory and unknown number of files inside (in this case

Re: Missing branches after clone

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 4:42 PM Ulrich Windl wrote: > > Hi! > > While wondering why some branches are not being displayed by "git branch" in > a cloned repository, I was reading the obvious man pages (man git-branch, man > git-remote), but still couldn't find the reason or the solution. Local a

Re: Is git-checkout's restoring d/f conflict really sane?

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 5:37 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > $ echo data > one > > $ git add one > > $ rm one > > $ mkdir one > > $ echo two > one/two > > $ echo three > one/three > > $ git checkout one > &g

Re: Missing branches after clone

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 5:33 PM Philip Oakley wrote: > > Hi Ulrich, > On 14/05/2019 11:12, Duy Nguyen wrote: > >> Then I > >> foundhttps://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches > >> which handles the subject... > >> B

Re: some git confusion (where git's advice didn't help)

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 07:21:15AM -0400, Jeff King wrote: > I also think the "warning: refname ... is ambiguous" message would > probably be a bit more helpful if it showed _which_ candidates it found > (and which one it chose!). Alternatively, just refuse to resolve ambiguous refs. It's not alwa

Re: "add worktree" fails with "fatal: Invalid path" error

2019-05-14 Thread Duy Nguyen
On Mon, May 13, 2019 at 7:55 PM Shaheed Haque wrote: > The original code used the more obvious "git worktree remove" rather > than "git worktree prune" but I switched partly because remove seemed > slow (I cannot now quantify what caused me to think that), and partly > because I was having other i

Re: [PATCH v2 1/7] run-command: add preliminary support for multiple hooks

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 7:24 AM brian m. carlson wrote: > -int run_hook_ve(const char *const *env, const char *name, va_list args) > +int find_hooks(const char *name, struct string_list *list) > { > - struct child_process hook = CHILD_PROCESS_INIT; > - const char *p; > + struct

Re: [PATCH v2 3/7] rebase: add support for multiple hooks

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 7:24 AM brian m. carlson wrote: > diff --git a/builtin/am.c b/builtin/am.c > index 912d9821b1..340eacbd44 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -441,24 +441,8 @@ static int run_applypatch_msg_hook(struct am_state > *state) > */ > static int run_post_rewr

Re: [PATCH v2 6/7] config: allow configuration of multiple hook error behavior

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 7:24 AM brian m. carlson wrote: > > There are a variety of situations in which a user may want an error > behavior for multiple hooks other than the default. Add a config option, > hook..errorBehavior to allow users to customize this behavior on a An alternative name is on

Re: [PATCH v2 0/7] Multiple hook support

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 7:23 AM brian m. carlson wrote: > > This series introduces multiple hook support. > > I've thought a lot about the discussion over whether this series should > use the configuration as the source for multiple hooks. Ultimately, I've > come to the decision that it's not a go

Re: [PATCH v2 7/7] docs: document multiple hooks

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 7:24 AM brian m. carlson wrote: > +It is possible to provide multiple hooks for a single function. If the > +main hook file is absent, If I remember 1/7 correctly, if the hook "file" is a directory, you ignore it and check for hook.d too. Which makes me think, can we just

Re: [PATCH] get_oid: handle NULL repo->index

2019-05-14 Thread Duy Nguyen
On Tue, May 14, 2019 at 8:54 PM Jeff King wrote: > diff --git a/sha1-name.c b/sha1-name.c > index 775a73d8ad..455e9fb1ea 100644 > --- a/sha1-name.c > +++ b/sha1-name.c > @@ -1837,7 +1837,7 @@ static enum get_oid_result > get_oid_with_context_1(struct repository *repo, > if (flags

Re: [PATCH] get_oid: handle NULL repo->index

2019-05-15 Thread Duy Nguyen
On Wed, May 15, 2019 at 12:16 PM Junio C Hamano wrote: > > Jeff King writes: > > > Also from my earlier message, if you missed it: > > > > I also wondered if we should simply allocate an empty index whenever > > we have a non-toplevel "struct repository", which might be less > > surprising

Re: Feedback on git-restore

2019-05-15 Thread Duy Nguyen
On Wed, May 15, 2019 at 09:38:59AM +, Poughon Victor wrote: > Hi > > I came across a description of a new git command currently in > development called 'git restore'. Since it's still not out, and the > original poster [1] seemed to ask for feedback, I though I'd send > some here. Hope that's

Re: Feedback on git-restore

2019-05-15 Thread Duy Nguyen
On Wed, May 15, 2019 at 12:59:17PM +0200, Ævar Arnfjörð Bjarmason wrote: > One thing that would be really useful (and maybe it even exists, I just > haven't seen it in the mails) is some abbreviated cheatsheet style doc > of before/after in the UI. Similar to cheatsheets like e.g.: > > https:/

Re: [PATCH v2 3/7] rebase: add support for multiple hooks

2019-05-16 Thread Duy Nguyen
On Thu, May 16, 2019 at 5:55 AM brian m. carlson wrote: > > On Tue, May 14, 2019 at 07:56:49PM +0700, Duy Nguyen wrote: > > On Tue, May 14, 2019 at 7:24 AM brian m. carlson > > wrote: > > > - close(cp.in); > > > > In the old code, we close cp.in...

Re: Running 'git worktree add' in 'pre-commit' hook

2019-05-16 Thread Duy Nguyen
On Tue, May 14, 2019 at 9:53 PM Cosmin Polifronie wrote: > > Hello! I am trying to run 'git worktree add HEAD' in the > 'pre-commit' hook, more specifically in a Python script that is being > called from the hook. When doing so, I am greeted with the following > error: > > On Windows 10: > Prepar

Re: [PATCH] clone: add `--remote-submodules` flag

2019-05-16 Thread Duy Nguyen
On Tue, May 14, 2019 at 2:46 AM Ben Avison wrote: > > When using `git clone --recurse-submodules` there was previously no way to > pass a `--remote` switch to the implicit `git submodule update` command for > any use case where you want the submodules to be checked out on their > remote-tracking b

Re: Running 'git worktree add' in 'pre-commit' hook

2019-05-16 Thread Duy Nguyen
On Thu, May 16, 2019 at 6:33 PM Eric Sunshine wrote: > I researched this also and concluded that it's a bug in git-commit. > You run afoul of it in other situations, as well. For instance, say > you have your index file in a non-standard location: > > $ export GIT_INDEX_FILE=../storage/index >

Re: Running 'git worktree add' in 'pre-commit' hook

2019-05-16 Thread Duy Nguyen
On Thu, May 16, 2019 at 6:39 PM Eric Sunshine wrote: > > On Thu, May 16, 2019 at 7:33 AM Eric Sunshine wrote: > > I researched this also and concluded that it's a bug in git-commit. > > You run afoul of it in other situations, as well. For instance, say > > you have your index file in a non-stand

Re: Running 'git worktree add' in 'pre-commit' hook

2019-05-16 Thread Duy Nguyen
On Thu, May 16, 2019 at 7:15 PM Eric Sunshine wrote: > > On Thu, May 16, 2019 at 7:42 AM Duy Nguyen wrote: > > On Thu, May 16, 2019 at 6:33 PM Eric Sunshine > > wrote: > > > You run afoul of it in other situations, as well. For instance, say > > > you ha

Re: Feedback on git-restore

2019-05-16 Thread Duy Nguyen
On Thu, May 16, 2019 at 7:12 PM Philip Oakley wrote: > Maybe we need a `git index` command to make it far more visible to > average users (or `git staging-area --show`, with a --cached option ;-). Not commenting on the other parts (and also Junio's mail) since I still need more time to process.

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-17 Thread Duy Nguyen
On Fri, May 17, 2019 at 12:35 PM Jeff King wrote: > As it turns out, index-pack does not handle these complicated cases at > all! In the final fix_unresolved_deltas(), we are only looking for thin > deltas, and anything that was not yet resolved is assumed to be a thin > object. In many of these c

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 3:55 PM Jeff King wrote: > > On Fri, May 17, 2019 at 02:20:42PM +0700, Duy Nguyen wrote: > > > On Fri, May 17, 2019 at 12:35 PM Jeff King wrote: > > > As it turns out, index-pack does not handle these complicated cases at > > > all! I

Re: [PATCH] clone: add `--remote-submodules` flag

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 12:50 AM Ben Avison wrote: > > On 16/05/2019 12:31, Duy Nguyen wrote: > > On Tue, May 14, 2019 at 2:46 AM Ben Avison wrote: > >> > >> When using `git clone --recurse-submodules` there was previously no way to > >> pass a `--remote

Re: [PATCH] worktree add: be tolerant of corrupt worktrees

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 2:46 PM Eric Sunshine wrote: > > On Mon, May 13, 2019 at 6:50 AM Nguyễn Thái Ngọc Duy > wrote: > > find_worktree() can die() unexpectedly because it uses real_path() > > instead of the gentler version. When it's used in 'git worktree add' [1] > > and there's a bad worktre

Re: Missing branches after clone

2019-05-18 Thread Duy Nguyen
On Tue, May 14, 2019 at 6:10 PM Philip Oakley wrote: > >> It is a 'branch which tracks a remote', and it is has the 'last time I > >> looked' state of the branch that is on the remote server, which may > >> have, by now, advanced or changed. > >> > >> So you need to have the three distinct views i

Re: Command to list Branches on a specific Remote (i.e. select from rtb's)

2019-05-19 Thread Duy Nguyen
On Sun, May 19, 2019 at 1:41 AM Ævar Arnfjörð Bjarmason wrote: > That's: > > git for-each-ref 'refs/remotes//' > git branch -a -l '/' > > The latter will conflate with any local branches you happen to > have prefixed with . That problem should be gone if you use -r instead of -a. -- Duy

Re: Command to list Branches on a specific Remote (i.e. select from rtb's)

2019-05-19 Thread Duy Nguyen
On Sun, May 19, 2019 at 2:55 AM Philip Oakley wrote: > I'll add the answer to one on the stackoverflow Q&A's I'd looked at. I > hadn't put the branch -a and -l options together. Maybe update/add some examples in our man pages too. -- Duy

Re: [ANNOUNCE] Git v2.22.0-rc1

2019-05-21 Thread Duy Nguyen
On Tue, May 21, 2019 at 5:27 AM Ævar Arnfjörð Bjarmason wrote: > > > On Mon, May 20 2019, Bryan Turner wrote: > > > On Sun, May 19, 2019 at 10:00 AM Junio C Hamano wrote: > >> > >> * The diff machinery, one of the oldest parts of the system, which > >>long predates the parse-options API, use

Re: [ANNOUNCE] Git v2.22.0-rc1

2019-05-21 Thread Duy Nguyen
(dropping lkml and git-packagers) On Tue, May 21, 2019 at 3:31 PM Duy Nguyen wrote: > > The bug there is that the old opt_arg() code would be torelant to empty > > values. I noticed a similar change the other day with the --abbrev > > option, but didn't think it was wor

Re: [PATCH] repository.c: always allocate 'index' at repo init time

2019-05-21 Thread Duy Nguyen
On Mon, May 20, 2019 at 8:17 PM Jeff King wrote: > The patch looks good, though I wonder if we could simplify even further > by just embedding an index into the repository object. The purpose of > having it as a pointer, I think, is so that the_repository can point to > the_index. But we could pos

Re: [ANNOUNCE] Git v2.22.0-rc1

2019-05-21 Thread Duy Nguyen
On Tue, May 21, 2019 at 6:24 PM Ævar Arnfjörð Bjarmason wrote: > > > On Tue, May 21 2019, Duy Nguyen wrote: > > > (dropping lkml and git-packagers) > > > > On Tue, May 21, 2019 at 3:31 PM Duy Nguyen wrote: > >> > The bug there is that the old

Re: [Breakage] 2.22.0-rc1 - t0211-trace2-perf.sh

2019-05-21 Thread Duy Nguyen
On Tue, May 21, 2019 at 6:51 PM Ævar Arnfjörð Bjarmason wrote: > But the real bug looks like the trace2 code unconditionally depending on > pthreads, even though NonStop has 'NO_PTHREADS = UnfortunatelyYes' > defined. > > That's why we get this th%d:unknown stuff, the trace2/tr2_tls.c code > using

Re: Incorrect diff-parseopt conversion?

2019-05-21 Thread Duy Nguyen
On Wed, May 22, 2019 at 2:56 AM Ramsay Jones wrote: > > Hi Duy, > > I am in the middle of rebasing a long running branch onto > current master (v2.22.0-rc1) and noticed something odd with > commit af2f368091 ("diff-parseopt: convert --output-*", > 2019-02-21). > > As part of the branch I am rebasi

Re: New diff test failures on s390x architecture (was: [ANNOUNCE] Git v2.22.0-rc1)

2019-05-23 Thread Duy Nguyen
On Fri, May 24, 2019 at 2:14 AM Todd Zullinger wrote: > > I wrote: > > While running the 2.22.0-rc1 tests on Fedora, I hit a few > > new test failures since 2.21.0 -- but only on the s390x > > architecture. > > > > I haven't had time to dig into these the past few days, so I > > thought I would se

Re: Incorrect diff-parseopt conversion?

2019-05-24 Thread Duy Nguyen
On Wed, May 22, 2019 at 7:35 AM Ramsay Jones wrote: > > > > On 22/05/2019 01:11, Duy Nguyen wrote: > > On Wed, May 22, 2019 at 2:56 AM Ramsay Jones > > wrote: > >> > >> Hi Duy, > >> > >> I am in the middle of rebasing a long runni

Re: [GSoC] How to protect cached_objects

2019-05-24 Thread Duy Nguyen
On Thu, May 23, 2019 at 11:51 PM Matheus Tavares Bernardino wrote: > > Hi, everyone > > As one of my first tasks in GSoC, I'm looking to protect the global > states at sha1-file.c for future parallelizations. Currently, I'm > analyzing how to deal with the cached_objects array, which is a small >

Re: [PATCH 0/3] fix diff-parseopt regressions

2019-05-25 Thread Duy Nguyen
On Sat, May 25, 2019 at 12:36 AM Todd Zullinger wrote: > > Hi, > > Nguyễn Thái Ngọc Duy wrote: > > This should fix the diff tests failure on s360x. It's a serious problem > > and I plan to do something to prevent it from happening again. > > Thanks for looking at this! > > I applied this on top of

Re: Incorrect diff-parseopt conversion?

2019-05-25 Thread Duy Nguyen
On Fri, May 24, 2019 at 5:08 PM Ævar Arnfjörð Bjarmason wrote: > >> OK, I just had a look at the code in parse-options.c. > >> Hmm, somewhat ugly! :-D > > > > Yeah it's a bit hackish. The problem is parse-options (and also config > > parser) does not allow passing user data to the callback. Changi

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

2019-05-25 Thread Duy Nguyen
On Thu, May 23, 2019 at 12:51 PM Jeff King wrote: > For fun, here's a constant-time zero-allocation implementation that I > came up with. It passes t0211 with NO_PTHREADS, but I didn't test it > beyond that. > > diff --git a/thread-utils.h b/thread-utils.h > index 4961487ed9..f466215742 100644 > -

Re: [GSoC] How to protect cached_objects

2019-05-25 Thread Duy Nguyen
On Sat, May 25, 2019 at 11:04 PM Matheus Tavares Bernardino wrote: > > On Fri, May 24, 2019 at 6:55 AM Duy Nguyen wrote: > > > > On Thu, May 23, 2019 at 11:51 PM Matheus Tavares Bernardino > > wrote: > > > > > > > > Hi, everyone > > &g

Re: [Proposal] git am --check

2019-06-03 Thread Duy Nguyen
On Mon, Jun 3, 2019 at 4:29 PM Christian Couder wrote: > > On Sun, Jun 2, 2019 at 7:38 PM Drew DeVault wrote: > > > > This flag would behave similarly to git apply --check, or in other words > > would exit with a nonzero status if the patch is not applicable without > > actually applying the patc

Re: worktree add already exists

2019-06-03 Thread Duy Nguyen
On Sun, Jun 2, 2019 at 2:11 PM Eric Sunshine wrote: > > On Mon, May 27, 2019 at 11:32 AM Ingo Wolf wrote: > > $ ls -a barework > > ./ ../ test.txt > > $ git -C bare worktree add --no-checkout ../barework > > Preparing worktree (new branch 'barework') > > fatal: '../barework' already exists > >

Re: [PATCH v2] config: learn the "onbranch:" includeIf condition

2019-06-05 Thread Duy Nguyen
On Sat, Jun 1, 2019 at 2:34 AM Denton Liu wrote: > > Currently, if a user wishes to have individual settings per branch, they > are required to manually keep track of the settings in their head and > manually set the options on the command-line or change the config at > each branch. > > Teach conf

Re: worktree add already exists

2019-06-05 Thread Duy Nguyen
On Tue, Jun 4, 2019 at 1:32 AM Eric Sunshine wrote: > > On Mon, Jun 3, 2019 at 5:47 AM Duy Nguyen wrote: > > On Sun, Jun 2, 2019 at 2:11 PM Eric Sunshine > > wrote: > > > On Mon, May 27, 2019 at 11:32 AM Ingo Wolf wrote: > > > > I would like to attach an

Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers

2019-06-05 Thread Duy Nguyen
On Wed, Jun 5, 2019 at 6:27 PM Jeff King wrote: > > On Wed, Jun 05, 2019 at 10:12:12AM +0200, Johannes Schindelin wrote: > > > This fails on macOS, in t5601, both in our osx-clang and osx-gcc jobs, as > > well as in the StaticAnalysis job. For details, see > > https://dev.azure.com/gitgitgadget/gi

Re: worktree add already exists

2019-06-06 Thread Duy Nguyen
On Wed, Jun 5, 2019 at 10:30 PM Ingo Wolf wrote: > > Am 05.06.2019 um 12:17 schrieb Duy Nguyen: > > "worktree add --no-checkout --keep-worktree" is quite readable > > worktree add --no-checkout -f (orce) > > I've expected to work on an not empty directory

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-12 Thread Duy Nguyen
On Sat, Jun 8, 2019 at 12:33 AM Felipe Contreras wrote: > > On Fri, Jun 7, 2019 at 5:02 AM SZEDER Gábor wrote: > > > > On Fri, Jun 07, 2019 at 04:30:34PM +0700, Nguyễn Thái Ngọc Duy wrote: > > > "git --git-completion-helper" could fail if the command checks for > > > a repo before parse_options(

Re: What's cooking in git.git (Jun 2019, #02; Thu, 6)

2019-06-12 Thread Duy Nguyen
On Fri, Jun 7, 2019 at 3:19 AM Junio C Hamano wrote: > * nd/switch-and-restore (2019-05-07) 43 commits > - Declare both git-switch and git-restore experimental > - help: move git-diff and git-reset to different groups > - doc: promote "git restore" > - user-manual.txt: prefer 'merge --abort' o

Re: Reducing git size by building libgit.so

2019-06-12 Thread Duy Nguyen
On Wed, Jun 12, 2019 at 2:11 PM brian m. carlson wrote: > > On 2019-06-11 at 19:52:18, Elmar Pruesse wrote: > > Hi! > > > > The total compiled size of libexec/git-core is currently somewhere > > around 30 MB. This is largely due to a number of binaries linking > > statically against libgit.a. For

Re: Reducing git size by building libgit.so

2019-06-12 Thread Duy Nguyen
On Wed, Jun 12, 2019 at 4:42 PM Ævar Arnfjörð Bjarmason wrote: > I.e. we'd just have one git binary, everything else symlinking to that, > and we'd route to the right program by inspecting argv, which we mostly > do already. If I remember correctly libcurl.so startup time was the reason it's spli

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-13 Thread Duy Nguyen
On Fri, Jun 14, 2019 at 7:30 AM Felipe Contreras wrote: > > On Wed, Jun 12, 2019 at 3:52 AM Duy Nguyen wrote: > > > > On Sat, Jun 8, 2019 at 12:33 AM Felipe Contreras > > wrote: > > > > Something like this should work: > > > > > > struc

Re: [PATCH] completion: do not cache if --git-completion-helper fails

2019-06-15 Thread Duy Nguyen
On Fri, Jun 14, 2019 at 1:07 PM Felipe Contreras wrote: > > On Thu, Jun 13, 2019 at 9:53 PM Duy Nguyen wrote: > > > > On Fri, Jun 14, 2019 at 7:30 AM Felipe Contreras > > wrote: > > > > One way or the other, shouldn't my tests be merged? The issue is

Re: [PATCH 0/8] Add 'ls-files --json' to dump the index in json

2019-06-19 Thread Duy Nguyen
On Wed, Jun 19, 2019 at 6:58 PM Derrick Stolee wrote: > > On 6/19/2019 5:58 AM, Nguyễn Thái Ngọc Duy wrote: > > This is probably just my itch. Every time I have to do something with > > the index, I need to add a little bit code here, a little bit there to > > get a better "view" of the index. > >

Re: [RFC/PATCH] gc: run more pre-detach operations under lock

2019-06-19 Thread Duy Nguyen
On Wed, Jun 19, 2019 at 5:26 PM Ævar Arnfjörð Bjarmason wrote: > This patch is part of a WIP branch I have that's a bit of a mess. It's > more-gc-detach-under-lock on github.com/avar/git.git. It doesn't apply > on master because it relies on some previous test work, but for RFC > purposes I figure

Re: [PATCH 6/8] read-cache.c: dump "IEOT" extension as json

2019-06-19 Thread Duy Nguyen
On Wed, Jun 19, 2019 at 8:18 PM Derrick Stolee wrote: > > On 6/19/2019 5:58 AM, Nguyễn Thái Ngọc Duy wrote:> @@ -2266,7 +2271,7 @@ int > do_read_index(struct index_state *istate, const char *path, int must_exist) > >* to multi-thread the reading of the cache entries. > >*/ > >

Re: [PATCH] fetch: only run 'gc' once when fetching multiple remotes

2019-06-20 Thread Duy Nguyen
On Thu, Jun 20, 2019 at 1:59 AM Jeff King wrote: > I was surprised that we needed a new command-line option here, but I > guess the sub-fetch processes really have no idea that they're > subservient to a multi-remote fetch (they do get "--append", but of > course somebody could specify that indepe

Re: [RFC/PATCH] gc: run more pre-detach operations under lock

2019-06-20 Thread Duy Nguyen
On Thu, Jun 20, 2019 at 5:49 AM Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Jun 19 2019, Jeff King wrote: > > > On Wed, Jun 19, 2019 at 08:01:55PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > >> > You could sort of avoid the problem here too with > >> > > >> > parallel 'git fetch --no-auto-gc {}'

Re: [PATCH 4/4] restore: add --intent-to-add (restoring worktree only)

2019-06-20 Thread Duy Nguyen
On Thu, Jun 20, 2019 at 9:34 PM Derrick Stolee wrote: > > On 6/20/2019 5:55 AM, Nguyễn Thái Ngọc Duy wrote: > > "git restore --source" (without --staged) could create new files > > (i.e. not present in index) on worktree to match the given source. But > > the new files are not tracked, so both "gi

Re: [PATCH 2/4] switch: allow to switch in the middle of bisect

2019-06-20 Thread Duy Nguyen
On Thu, Jun 20, 2019 at 9:02 PM Derrick Stolee wrote: > > On 6/20/2019 5:55 AM, Nguyễn Thái Ngọc Duy wrote: > > In c45f0f525d (switch: reject if some operation is in progress, > > 2019-03-29), a check is added to prevent switching when some operation > > is in progress. The reason is it's often no

Re: [PATCH 0/8] Add 'ls-files --json' to dump the index in json

2019-06-21 Thread Duy Nguyen
On Thu, Jun 20, 2019 at 2:17 AM Jeff King wrote: > I think your warning in the manpage that this is for debugging is fine, > as it does not put us on the hook for maintaining the feature nor its > format forever. We might want to call it "--debug=json" or something, Hmm.. does it mean we make --d

<    8   9   10   11   12   13   14   15   16   17   >