[PATCH 03/20] path.c: add git_common_path() and strbuf_git_common_path()

Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 3 +++ path.c | 29 + 2 files changed, 32 insertions(+) diff --git a/cache.h b/cache.h index dfc459c..ec71181 100644 --- a/cache.h +++ b/cache.h @@ -747,11 +747,14 @@ extern int

[PATCH 18/20] worktree: refactor add_worktree()

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 130 + 1 file changed, 81 insertions(+), 49 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 8d59199..3ebb9e9 100644 ---

[PATCH 15/20] worktree: avoid 0{40}, too many zeroes, hard to read

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 7b217fb..f490ca3 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -263,7 +263,7 @@ static int

[PATCH 17/20] worktree: add "move" commmand

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c| 51 +++ t/t2028-worktree-move.sh (new +x) | 41 +++ 2 files changed, 92 insertions(+) create mode 100755 t/t2028-worktree-move.sh diff

[PATCH 14/20] worktree.c: add collect_per_worktree_git_paths()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 58 ++ worktree.h | 6 ++ 2 files changed, 64 insertions(+) diff --git a/worktree.c b/worktree.c index d4513b1..047319b 100644 --- a/worktree.c +++ b/worktree.c

[PATCH 16/20] worktree: simplify prefixing paths

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index f490ca3..36d942e 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -332,7 +332,7 @@ static

[PATCH 20/20] worktree: move repo, convert main worktree

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 87 ++-- t/t2028-worktree-move.sh | 36 2 files changed, 112 insertions(+), 11 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c

[PATCH 19/20] worktree: move repo, simple case

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 45 + 1 file changed, 45 insertions(+) diff --git a/builtin/worktree.c b/builtin/worktree.c index 3ebb9e9..80a8b80 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c

[PATCH 12/20] worktree.c: add update_worktree_location()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 23 +++ worktree.h | 6 ++ 2 files changed, 29 insertions(+) diff --git a/worktree.c b/worktree.c index 80c525b..a11c053 100644 --- a/worktree.c +++ b/worktree.c @@ -221,6 +221,29 @@ int

[PATCH 13/20] worktree.c: add update_worktree_gitfile()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 15 ++- worktree.h | 7 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/worktree.c b/worktree.c index a11c053..d4513b1 100644 --- a/worktree.c +++ b/worktree.c @@ -237,13 +237,26 @@ int

Re: [PATCH] Trick to force setup of a specific configured E-Mail per repo

Jeff King writes: > Just when I dare to think "somebody cannot possibly be relying on this > arcane behavior", I am proven wrong. :) My thoughts, exactly. This is the kind of thing that makes this project uncomfortably "interesting"; we cannot make improvements without risking

[PATCH 04/20] path.c: add is_git_path_shared()

Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 2 ++ path.c | 27 ++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index ec71181..c75d13f 100644 --- a/cache.h +++ b/cache.h @@ -748,6 +748,8 @@ extern int

[PATCH 05/20] copy.c: add copy_dir_recursively()

This is busybox's copy_file() [1] modified to fit in Git. Because this is busybox, the code is likely POSIX-y (or even Linux-y). Windows support may not be there yet. [1] in libbb/copy_file.c from the GPL2+ commit f2c043acfcf9dad9fd3d65821b81f89986bbe54e (busybox: fix uninitialized memory

[PATCH 07/20] worktree.c: store "id" instead of "git_dir"

We can reconstruct git_dir from id quite easily. It's a bit hackier to do the reverse. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 29 - worktree.h | 7 ++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/worktree.c

[PATCH 08/20] worktree.c: add clear_worktree()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 14 +++--- worktree.h | 5 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/worktree.c b/worktree.c index 4c38414..b4e4b57 100644 --- a/worktree.c +++ b/worktree.c @@ -4,14 +4,22 @@ #include

[PATCH 11/20] worktree.c: recognize no main worktree

Because HEAD is part of repository signature, even if it's per-worktree file, we can't simply delete it. So main worktree is considered gone if .git/HEAD contains all-zero SHA-1. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 2 ++ 1 file changed, 2 insertions(+) diff

[PATCH 09/20] worktree.c: add find_worktree_by_path()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 16 worktree.h | 6 ++ 2 files changed, 22 insertions(+) diff --git a/worktree.c b/worktree.c index b4e4b57..e444ad1 100644 --- a/worktree.c +++ b/worktree.c @@ -198,6 +198,22 @@ const char

[PATCH 10/20] worktree.c: add is_main_worktree()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 5 + worktree.h | 5 + 2 files changed, 10 insertions(+) diff --git a/worktree.c b/worktree.c index e444ad1..e878f49 100644 --- a/worktree.c +++ b/worktree.c @@ -214,6 +214,11 @@ struct worktree

[PATCH 06/20] worktree.c: use is_dot_or_dotdot()

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- worktree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 475b958..7b217fb 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c

[PATCH 02/20] usage.c: add sys_error() that prints strerror() automatically

Signed-off-by: Nguyễn Thái Ngọc Duy --- git-compat-util.h | 1 + usage.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/git-compat-util.h b/git-compat-util.h index e8f2867..f2bd775 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -398,6

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

Junio C Hamano writes: > The change to t0023 is merely an example that shows that existing > tests assume the convert_to_git() way of defining the dirtyness of > the working tree. It used to be OK to have core.autocrlf set to true, > have LF terminated file on the working

Re: [PATCH] Trick to force setup of a specific configured E-Mail per repo

(resend - my mailer was misconfigured) On Tue, Feb 02, 2016 at 10:56:48PM -0500, Jeff King wrote: > On Tue, Feb 02, 2016 at 09:54:21PM +0200, Dan Aloni wrote: >[..] > > + if (strict && email && !strcmp(email, "(per-repo)")) { > > + die("email is '(per-repo)', suggesting to set

Re: Bug: Wrong GitHub API result when retrieving repository information

Wrong mailing list? > On 3 Feb 2016, at 06:58, Wert Alexander > wrote: > > Dear GitHub Developers, > > I'm using the GitHub API for retrieving statistics like stargazers_count or > watchers_count. > Unfortunately, an API call to

[PATCH 00/20] "git worktree move" preview

This is the rough first cut of "git worktree move" for early feedback. The series adds "git worktree move" which can - move a linked worktree to another place - move .git repository away The first use case is obvious. The second less so. Main worktree has always been an odd ball because it

[PATCH 01/20] usage.c: move format processing out of die_errno()

Signed-off-by: Nguyễn Thái Ngọc Duy --- usage.c | 25 +++-- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/usage.c b/usage.c index 82ff131..0dba0c5 100644 --- a/usage.c +++ b/usage.c @@ -109,19 +109,12 @@ void NORETURN die(const char *err,

Re: [PATCH v2] test-lib: limit the output of the yes utility

Hi Hannes, On Tue, 2 Feb 2016, Johannes Sixt wrote: > I'm not 100% satisfied with your version because it stomps on > short-and-sweet shell variables $i and $y. Please note that $y was already stomped on before my patch. > But then the utility only occurs upstream of a pipeline in a separate >

Re: git submodule should honor "-c credential.helper" command line argument

On 03.02.2016 08:35, Jacob Keller wrote: On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote: I think the problem is that when git "switches" to working in the submodule repository, it clears the environment, which includes any "-c" command switches. This makes sense for some

SV: Using Git for Cobol source

Hi I wonder if it is ok to use Git for source control for Cobol programs and take advantage of parallel development ? Today we are using VSS and needs to be replaced. Our Cobol development is done by an Eclipse tool (Micro Focus Enterprise Developer) Regards

Re: [PATCH v4 05/12] ref-filter: introduce parsing functions for each valid atom

On Sun, Jan 31, 2016 at 12:42 PM, Karthik Nayak wrote: > Parsing atoms is done in populate_value(), this is repetitive and > hence expensive. Introduce a parsing function which would let us parse > atoms beforehand and store the required details into the 'used_atom' >

RE: Using Git for Cobol source

On February 3, 2016 4:20 AM, Per Jørgen Johnsen wrote: > Subject: SV: Using Git for Cobol source > I wonder if it is ok to use Git for source control for Cobol programs and take > advantage of parallel development ? > > Today we are using VSS and needs to be replaced. Our Cobol development is >

Re: git object-count differs between clones

- Original Message - > From: "Jeff King" > To: "Andrew Martin" > Cc: "Matthieu Moy" , git@vger.kernel.org > Sent: Tuesday, February 2, 2016 10:34:12 PM > Subject: Re: git object-count differs between clones > > On Tue,

Re: [PATCH 6/8] git submodule update: have a dedicated helper for cloning

Stefan Beller writes: > + if (ce_stage(ce)) { > + if (pp->recursive_prefix) > + strbuf_addf(err, "Skipping unmerged submodule > %s/%s\n", > + pp->recursive_prefix, ce->name); > +

Bug in git-sh-prompt: incorrectly determines the upstream for repos produced by recent git svn clone --stdlayout

Let me copy-paste the original bug report from the Debain mail list by Paul Wise http://comments.gmane.org/gmane.linux.debian.devel.bugs.general/1321117. The bug is still reproducible with the latest version of git-prompt.sh. I recently did a git svn clone of the Planet Debian SVN and I

Re: [PATCH 6/8] git submodule update: have a dedicated helper for cloning

On Wed, Feb 3, 2016 at 3:24 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> + if (ce_stage(ce)) { >> + if (pp->recursive_prefix) >> + strbuf_addf(err, "Skipping unmerged submodule >>

Re: [PATCH 3/8] submodule-config: remove name_and_item_from_var

Stefan Beller writes: > `name_and_item_from_var` does not provide the proper abstraction > we need here in a later patch. ... so the idea is to first open-code the calling site in this patch, and bring a different abstraction that is better suited to this machinery in a

Re: [PATCH 1/8] submodule-config: keep update strategy around

Stefan Beller writes: > We need the submodule update strategies in a later patch. > > Signed-off-by: Stefan Beller > Signed-off-by: Junio C Hamano > --- > submodule-config.c | 11 +++ > submodule-config.h | 1 + > 2 files

Re: [PATCH 2/8] submodule-config: drop check against NULL

Stefan Beller writes: > Adhere to the common coding style of Git and not check explicitly > for NULL throughout the file. There are still other occurrences in the > code base but that is usually inside of conditions with side effects. > > Signed-off-by: Stefan Beller

Re: [PATCH 4/8] submodule-config: introduce parse_generic_submodule_config

Stefan Beller writes: > This rewrites parse_config to distinguish between configs specific to > one submodule and configs which apply generically to all submodules. > We do not have generic submodule configs yet, but the next patch will > introduce "submodule.fetchJobs". OK.

Re: [PATCH 5/8] fetching submodules: respect `submodule.fetchJobs` config option

Stefan Beller writes: > This allows to configure fetching and updating in parallel > without having the command line option. > > This moved the responsibility to determine how many parallel processes > to start from builtin/fetch to submodule.c as we need a way to communicate

Re: [PATCH 4/8] submodule-config: introduce parse_generic_submodule_config

Stefan Beller writes: >> The same comment as in the footnote for the review on [3/8] applies >> here. > > Ok, so we want to have > > [section ""] > > and > > [section] > > be different, such that we could have a submodule with an "" name, > but still be able to

Re: [PATCH 6/8] git submodule update: have a dedicated helper for cloning

Stefan Beller writes: > On Wed, Feb 3, 2016 at 3:24 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> + if (ce_stage(ce)) { >>> + if (pp->recursive_prefix) >>> +

Re: [PATCH v3 00/20] refs backend rebase on pu

On Wed, 2016-02-03 at 16:09 -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > David Turner writes: > > > > > Are there any more reviews on this? I do have some changes from > > > this > > > set, but they're pretty minor so I don't want to

Re: [PATCH v4 05/12] ref-filter: introduce parsing functions for each valid atom

Eric Sunshine writes: >> @@ -138,10 +140,9 @@ int parse_ref_filter_atom(const char *atom, const char >> *ep) >> * shouldn't be used for checking against the valid_atom >> * table. >> */ >> - const char

[PATCH] gitk: Follow themed bgcolor in help dialogs

Make Help > About & Key bindings dialogs readable if theme has changed font color to something incompatible with white. Signed-off-by: Guillermo S. Romero --- Hi: Found more places where themable colors makes things unreadable because not everything adapted to

Re: [PATCH 1/8] submodule-config: keep update strategy around

On Wed, Feb 03, 2016 at 03:09:06PM -0800, Junio C Hamano wrote: > > + } else if (!strcmp(item.buf, "update")) { > > + if (!value) > > + ret = config_error_nonbool(var); > > + else if (!me->overwrite && submodule->update != NULL) > > +

Re: [PATCH v3 00/20] refs backend rebase on pu

On 04/02/16 01:12, David Turner wrote: > On Wed, 2016-02-03 at 16:09 -0800, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> David Turner writes: >>> Are there any more reviews on this? I do have some changes from this set, but

Re: [PATCH v3 00/20] refs backend rebase on pu

On Thu, Feb 04, 2016 at 01:54:44AM +, Ramsay Jones wrote: > > They were working for me as-of the time I sent them. I guess something > > must have broken since. I'll rebase, test, and send a new series. > > I didn't spend too long looking at it, but I think this interacts with > Jeff's

Re: [PATCH 4/8] submodule-config: introduce parse_generic_submodule_config

On Wed, Feb 3, 2016 at 3:09 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This rewrites parse_config to distinguish between configs specific to >> one submodule and configs which apply generically to all submodules. >> We do not have generic

Re: git submodule should honor "-c credential.helper" command line argument

On Tue, Feb 2, 2016 at 8:25 PM, Jeff King wrote: > On Tue, Feb 02, 2016 at 06:13:14PM +0100, Marc Strapetz wrote: > >> git -c credential.helper=helper submodule update --init submodule >> >> does not invoke "helper", but falls back to the default strategies. >> When configuring in

Re: [PATCH v3 00/20] refs backend rebase on pu

Junio C Hamano writes: > David Turner writes: > >> Are there any more reviews on this? I do have some changes from this >> set, but they're pretty minor so I don't want to post a new one (unless >> folks would rather see those changes before

Re: parse_object does check_sha1_signature but not parse_object_buffer?

On Tue, Feb 02, 2016 at 11:25:44AM -0800, Junio C Hamano wrote: > Having said that, I do not necessarily think "git checkout" should > revalidate the object name. The repository that you use for your > daily work would have the same error/corruption rate as your working > tree files, and I do

Re: [PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Wed, Feb 03, 2016 at 11:19:09PM -0500, Jeff King wrote: > On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote: > > > > + if (ident_explicit) { > > > + if (name == git_default_name.buf && > > > + !(committer_ident_explicitly_given & IDENT_NAME_GIVEN) && > > > +

Re: [PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Wed, Feb 03, 2016 at 09:22:27PM +0200, Dan Aloni wrote: > > * The new config variable "user.explicit" has a more nebulous name > > than Peff's suggestion of "user.guessIdent", which may make its intent > > harder to determine without consulting documentation. > > I wasn't sure about that, was

Re: [PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote: >[..] > > > * Do these new tests really deserve a new test script, or would they > > > fit into an existing script? (Genuine question.) > > > > I am not sure. IMHO it makes sense to have a new test script for a new > > feature. > > I

Re: [PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote: > > + if (ident_explicit) { > > + if (name == git_default_name.buf && > > + !(committer_ident_explicitly_given & IDENT_NAME_GIVEN) && > > + !(author_ident_explicitly_given & IDENT_NAME_GIVEN)) > > +

Re: [PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Thu, Feb 04, 2016 at 07:36:46AM +0200, Dan Aloni wrote: > > In a sense, that encourages a nice workflow for your intended feature. > > You have to do: > > > > git clone -c user.name=... -c user.email=... clone ... > > > > to set up your ident in the newly-cloned repository, or else clone

Re: [PATCH v3 13/20] refs: resolve symbolic refs first

On Thu, Jan 14, 2016 at 11:26:10AM -0500, David Turner wrote: > +static int dereference_symrefs(struct ref_transaction *transaction, > +struct strbuf *err) > +{ > + int i; > + int nr = transaction->nr; > + > + for (i = 0; i < nr; i++) { > +

Re: git stash save -u deletes ignored files without stashing them

On Sun, 2015-12-13 at 7:51, Michael Brade wrote: > Now node_modules will be deleted even though it was ignored at the time > of the "git stash save -u". Apparently .gitignore is reverted first, > then the cleanup is done taking the new state of .gitignore into account > where node_modules is now

Re: git gc leaved my disk 100% full

On Tue, Jan 19, 2016 at 05:09:57PM +0100, Jean Delvare wrote: > Earlier today my desktop environment warned me that my /home was almost > full. I thought that running "git gc" on my git trees would maybe save > some disk space. > > Unfortunately the opposite happened. "git gc" failed on me with:

Re: git 2.7.0 crashes when top-down memory allocation preference is set

Hi, On Wed, 3 Feb 2016, Klinger, Xia wrote: > When the memory allocation preference is set to be Top-down on Windows > and there are more than 4GB memory available, git will crash. The > symptom is "Segmentation Fault". This might be related to https://github.com/git-for-windows/git/issues/627

Re: Bug: Branch Deletion Doesn't Clean Up

On Thu, Jan 07, 2016 at 02:24:41PM -0500, Karl Moskowski wrote: > The problem is, deleting a branch whose name contains slashes doesn’t > delete the directories in .git/refs/heads/. Yes. Git's model is to leave the directories in place, and remove them only when they get in the way of creating

Re: Bug: Branch Deletion Doesn't Clean Up

[resend; sorry, I forgot to cc Michael on the first one] On Thu, Jan 07, 2016 at 02:24:41PM -0500, Karl Moskowski wrote: > The problem is, deleting a branch whose name contains slashes doesn’t > delete the directories in .git/refs/heads/. Yes. Git's model is to leave the directories in place,

git stash pop --quiet is not always quiet after save -u

Using git 2.7.0 or master (563e3849) apply/pop prints "Already up-to-date!" if the stash contains only untracked files. As an example: git init git commit --allow-empty -m init touch test.txt git stash -u Now that the stash contains only untracked files, applying it with either pop or apply

Re: [PATCH] log -g: ignore revision parameters that have no reflog

On di, 2016-02-02 at 16:21 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker writes: > > > + if (revs->reflog_info) { > > + /* > > +  * The reflog iterator gets confused when fed > > things that don't > > +  * have reflogs. Help it along a

Re: [PATCH] Trick to force setup of a specific configured E-Mail per repo

On Wed, Feb 3, 2016 at 3:21 AM, Dan Aloni wrote: > On Tue, Feb 02, 2016 at 10:56:48PM -0500, Jeff King wrote: >> On Tue, Feb 02, 2016 at 09:54:21PM +0200, Dan Aloni wrote: >> > + if (strict && email && !strcmp(email, "(per-repo)")) { >> > + die("email is

git 2.7.0 crashes when top-down memory allocation preference is set

When the memory allocation preference is set to be Top-down on Windows and there are more than 4GB memory available, git will crash. The symptom is "Segmentation Fault". How to reproduce 1. Install latest Git package on Windows 7 x64 2. Enable top-down memory allocation preference 3. Open Git

[PATCH v3] Add user.explicit boolean for when ident shouldn't be guessed

On Wed, Feb 03, 2016 at 12:47:56PM -0500, Eric Sunshine wrote: >[..] > * The final paragraph of the commit message appears to be outdated > since it still seems to be describing the approach taken by v1. Revised. > * Elsewhere, in the project, the spelling "email" is preferred over > "E-Mail";

Re: [PATCH] log -g: ignore revision parameters that have no reflog

Dennis Kaarsemaker writes: > It is not, the code should look for @{, not @. Not exactly. $ git show -s --format='%h %s' 'HEAD^{/@{3}}' -- 55d5d5b combine-diff.c: fix performance problem when folding ... The commit has a line with a string "@@@" on it and the