Re: [PATCH] clean: new option --exclude-from

Jeff King writes: > On Tue, Dec 01, 2015 at 06:18:30PM -0800, Junio C Hamano wrote: > >> It is likely that existing users are already using $HOME/.gitconfig >> that sets core.excludesfile=$HOME/.gitconfig as the personal >> fallback, that is overriden, not tweaked, by project

Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am

On Wed, Dec 02, 2015 at 01:38:18PM +0100, huebbe wrote: > As such, I would like to ask whether it would be possible/sensible > to somehow escape square brackets, or mark the beginning > of the original commit message in the `git format-patch` output? > This would allow `git am` to reproduce the

RE: How to move users from SEU (AS400) to Git?

On December-02-15 1:10 PM dleong wrote: >I stumbled on this topic while doing a research on how to move RPG source >control to adopt using Git. I wonder if the original question was answered. >My company would love to have a more central system to maintain both RPG codes >and javascript codes. We

Re: Git clone fails during pre-commit hook due to GIT_WORK_TREE=. (regression 2.5 -> 2.6)

Duy Nguyen writes: > ... But let me sleep on it (and everybody please > give ideas if you have any). Meanwhile, maybe reverting d95138e should > be done any way for now. Broken aliases are not as bad as broken > hooks. OK, when/if you decide that our first step should be a

Re: [PATCH] clean: new option --exclude-from

On Wed, Dec 02, 2015 at 09:25:24AM -0800, Junio C Hamano wrote: > I do not think we should liberally add options that apply to > anything "git" in the first place [*1*]. Limit them to ones that > are really special and fundamental that changes the way Git > operates, i.e. "Where is our

Re: [PATCH] clean: new option --exclude-from

On Wed, Dec 02, 2015 at 08:40:05AM -0800, Junio C Hamano wrote: > But for this particular one, I viewed the topic as adding a new > option as a shorter way for passing multiple -e options on > the command line. When viewed that way, even if core.excludesfile > were multi-valued, I wouldn't have

Re: [PATCH V3] git-send-email: Add auto-cc to all body signatures

On Wed, 2015-12-02 at 09:58 -0800, Junio C Hamano wrote: > "Trailers" are not limited to "*-by:" btw:  what are "Trailers" limited by? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

[PATCH V3] git-send-email: Add auto-cc to all body signatures

Many types of signatures are used by various projects. The most common type is formatted: "[some_signature_type]-by: First Last domain.tld>" e.g: "Reported-by: First Last domain.tld>" (no quotes are used) Make git-send-email use these signatures as "CC:" entries. Add command

Re: [PATCH] clean: new option --exclude-from

Jeff King writes: > So maybe "clean" is really the only place where people care > about such ad-hoc exclusion. Or maybe this an opportunity to add: > > git --exclude='*.o' clean > > I dunno. I cannot think of a time when I would have used any of those > options myself. Me

Re: [PATCH V3] git-send-email: Add auto-cc to all body signatures

Joe Perches writes: > Many types of signatures are used by various projects. > > The most common type is formatted: > "[some_signature_type]-by: First Last domain.tld>" > e.g: > "Reported-by: First Last domain.tld>" (no quotes are used) > > Make git-send-email use

Re: How to move users from SEU (AS400) to Git?

I stumbled on this topic while doing a research on how to move RPG source control to adopt using Git. I wonder if the original question was answered. My company would love to have a more central system to maintain both RPG codes and javascript codes. We use Rational Developer exclusively (no more

Re: [PATCH V3] git-send-email: Add auto-cc to all body signatures

On Wed, 2015-12-02 at 09:58 -0800, Junio C Hamano wrote: > Joe Perches writes: > > > Many types of signatures are used by various projects. > > > > The most common type is formatted: > > "[some_signature_type]-by: First Last domain.tld>" > > e.g: > > "Reported-by:

Re: [RFC/PATCH 2/8] update-index: add --test-untracked-cache

On Tue, Dec 1, 2015 at 9:31 PM, Christian Couder wrote: > diff --git a/builtin/update-index.c b/builtin/update-index.c > index e568acc..b7b5108 100644 > --- a/builtin/update-index.c > +++ b/builtin/update-index.c > @@ -996,8 +996,10 @@ int cmd_update_index(int argc,

Re: [RFC/PATCH 1/8] update-index: add untracked cache notifications

On Tue, Dec 1, 2015 at 9:31 PM, Christian Couder wrote: > Doing: > > cd /tmp > git --git-dir=/git/somewhere/else/.git update-index --untracked-cache > > doesn't work how one would expect. It hardcodes "/tmp" as the directory > that "works" into the index, so if you

[PATCH] Fix quoting of redirect in test script

From: Charles Bailey --- t/t3404-rebase-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) If you are using bash (at least 4.3.30 or 4.3.42) this actually causes an error due to an "ambiguous redirect" because there is a space in "trash directory".

[PATCH 2/5] config.c: move worktree-specific variables to .git/worktrees/...

.git/info/config.worktree is a pattern list that splits .git/config in to sets: the worktree set matches the patterns, the commmon set does not. In normal worktrees, both sets are stored in .git/config. The config.worktree has no effect. Nothing is changed. In linked worktrees, the common and

[PATCH 3/5] setup.c: remove special case of core.worktree and core.bare

core.worktree and core.bare, which are treated specially in 31e26eb [1], are now moved to info/core.worktree and the special treatment reverted. The test "$GIT_DIR/common overrides core.worktree" in t1501 from 31e26eb verifies that the behavior is still correct after this change. A note about

[PATCH 4/5] worktree: make core.sparseCheckout and core.ignoreStat per-worktree

The first one must be per-worktree because info/sparse-checkout already is. The second one shares the same nature and should also be per-worktree. Note, because info/config.worktree uses .gitignore syntax, you can negate a default pattern and revert it back to per-repo.. Signed-off-by: Nguyễn

[PATCH 0/5] Split .git/config in multiple worktree setup

Let's restart this. From the last discussion [1], we need to make core.worktree per-worktree for submodules to work. We also need core.sparseCheckout per-worktree. This series adds a pattern list, with .gitignore syntax mostly, that split config var set into two sets, the per-worktree set will be

[PATCH 5/5] git-worktree.txt: mention about the config file split

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 13 + 1 file changed, 13 insertions(+) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 5b9ad04..299e4f2 100644 --- a/Documentation/git-worktree.txt +++

Re: [RFC/PATCH] config: add core.trustmtime

On Wed, Nov 25, 2015 at 10:00 AM, Ævar Arnfjörð Bjarmason wrote: > Aside from the slight hassle of enabling this and keeping it enabled > this feature is great. It's sped up "git status" across the board by > about 40%. Slightly less than that on faster spinning disks, slightly

[PATCH] ref-filter: mark some file-local functions static

Signed-off-by: Ramsay Jones --- Hi Karthik, If you need to re-roll the patches in your 'kn/ref-filter-atom-parsing' branch, could you please squash the relevant parts of this patch into yours. Thanks! ATB, Ramsay Jones ref-filter.c | 10 +- 1 file

git-clone fails when current user is not in /etc/passwd

My use case it running git clone inside a docker container with `docker run --user $(id -u):$(id -g) --volume /foo:/foo ...`. I want all /foo/* file creation/access from inside the Docker container to be done as the current uid/gid of the host system. Steps to reproduce: mkdir /tmp/docker-git

[PATCH 1/5] dir.c: clean the entire struct in clear_exclude_list()

Make sure "el" can be reuseable again. The problem was el->alloc is not cleared and may cause segfaults next time because add_exclude() thinks el->excludes (being NULL) has enough space. Just clear the entire struct to be safe. Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c |

[PATCH] show signature of commit in gitk

but still depending on the added --show-signature as argument longer explanation: git supports for some time now signed commits, and also show the signature and its trust level inside the `git log` command. Now, it can also get shown in gitk. Signed-off-by: Flyingmana

Re: [RFC/PATCH 7/8] update-index: prevent --untracked-cache from performing tests

On Tue, Dec 1, 2015 at 9:31 PM, Christian Couder wrote: diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh > index 0e8d0d4..8c3e703 100755 > --- a/t/t7063-status-untracked-cache.sh > +++ b/t/t7063-status-untracked-cache.sh > @@ -11,7

BuGit: File-less distributed issue tracking system with Git

I've hacked on this for personal use, mostly, but I figured if there could be interest in such a beast, this is probably one of the best places to find it. So, see attached BuGit, an issue tracking system which stores its database in Git to try and get "distributed operation for free". By

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

Jeff King writes: > What's cooking in git.git (Dec 2015, #01; Tue, 1) > -- > > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > I think I managed to get my working area (together with a handful of > new entries in the rerere database and a few merge-fix/ entries) in > sync with what you pushed out well enough that my automated > procedure would recreate the

Re: [PATCH/RFC 07/10] ref-filter: introduce align_atom_parser()

On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce align_atom_parser() which will parse 'align' atoms and store > the required width and position into the 'used_atom' structure. While > we're here, add support for the usage of 'width=' and 'position=' when >

[PATCH 15/16] refs: add LMDB refs backend

Add a database backend for refs using LMDB. This backend runs git for-each-ref about 30% faster than the files backend with fully-packed refs on a repo with ~120k refs. It's also about 4x faster than using fully-unpacked refs. In addition, and perhaps more importantly, it avoids case-conflict

[PATCH 08/16] refs: add methods to init refs backend and db

Alternate refs backends might not need the refs/heads directory and so on, so we make ref db initialization part of the backend. We also might need to initialize ref backends themselves, so we'll add a method for that as well. Signed-off-by: David Turner ---

[PATCH 12/16] refs: always handle non-normal refs in files backend

Always handle non-normal (per-worktree or pseudo) refs in the files backend instead of alternate backends. Sometimes a ref transaction will update both a per-worktree ref and a normal ref. For instance, an ordinary commit might update refs/heads/master and HEAD (or at least HEAD's reflog). We

[PATCH 10/16] refs: make lock generic

Instead of using a files-backend-specific struct ref_lock, the generic ref_transaction struct should provide a void pointer that backends can use for their own lock data. Signed-off-by: David Turner --- refs/files-backend.c | 29 -

[PATCH 16/16] refs: tests for lmdb backend

Add tests for the database backend. Signed-off-by: David Turner Helped-by: Dennis Kaarsemaker --- t/t1460-refs-lmdb-backend.sh| 1109 +++ t/t1470-refs-lmdb-backend-reflog.sh | 359

[PATCH 13/16] init: allow alternate backends to be set for new repos

git init learns a new argument --refs-backend-type. Presently, only "files" is supported, but later we will add other backends. When this argument is used, the repository's core.refsBackendType configuration value is set, and the refs backend's initdb function is used to set up the ref database.

[PATCH 02/16] refs: add methods for misc ref operations

From: Ronnie Sahlberg Add ref backend methods for: resolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref, create_symref, resolve_gitlink_ref. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner ---

[PATCH 14/16] refs: allow ref backend to be set for clone

Add a new option, --refs-backend-type, to allow the ref backend type to be set on new clones. Submodules must use the same ref backend as the parent repository, so we also pass the --refs-backend-type option option when cloning submodules. Signed-off-by: David Turner

[PATCH 03/16] refs: add methods for the ref iterators

From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 54 refs/files-backend.c | 41

[PATCH 05/16] refs: add methods for reflog

In the file-based backend, the reflog piggybacks on the ref lock. Since other backends won't have the same sort of ref lock, ref backends must also handle reflogs. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c

[PATCH 09/16] refs: add method to rename refs

Signed-off-by: David Turner --- refs.c | 37 + refs/files-backend.c | 4 +++- refs/refs-internal.h | 9 + 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/refs.c b/refs.c index bdeb276..1b79630

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

Jeff King writes: > On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > >> I think I managed to get my working area (together with a handful of >> new entries in the rerere database and a few merge-fix/ entries) in >> sync with what you pushed out well enough that my

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

On Wed, 2015-12-02 at 14:11 -0800, Junio C Hamano wrote: > Jeff King writes: > > > What's cooking in git.git (Dec 2015, #01; Tue, 1) > > -- > > > > Here are the topics that have been cooking. Commits prefixed with > > '-' are only

[PATCH 06/16] refs: add method for initial ref transaction commit

Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 6 ++ refs/files-backend.c | 5 +++-- refs/refs-internal.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index

[PATCH 07/16] refs: add method for delete_refs

In the file-based backend, delete_refs has some special optimization to deal with packed refs. In other backends, we might be able to make ref deletion faster by putting all deletions into a single transaction. So we need a special backend function for this. Signed-off-by: David Turner

[PATCH 01/16] refs: add a backend method structure with transaction functions

From: Ronnie Sahlberg Add a ref structure for backend methods. Start by adding a method pointer for the transaction commit function. Add a function set_refs_backend to switch between backends. The files based backend is the default. Signed-off-by: Ronnie Sahlberg

[PATCH 11/16] refs: move duplicate check to common code

The check for duplicate refnames in a transaction is needed for all backends, so move it to the common code. ref_transaction_commit_fn gains a new argument, the sorted string_list of affected refnames. Signed-off-by: David Turner --- refs.c | 71

[PATCH 00/16] LMDB refs backend atop pre-vtable

I'm starting the patchset numbering over from 1 here, because this version of the patchset is a subset of the last version. This version of the patch set applies on top of dt/refs-backend-pre-vtable. This required moving a bunch of stuff that was in refs.h in previous versions into

[PATCH 04/16] refs: add do_for_each_per_worktree_ref

Alternate refs backends might still use files to store per-worktree refs. So the files backend's ref-loading infrastructure should be available to those backends, just for use on per-worktree refs. Add do_for_each_per_worktree_ref, which iterates over per-worktree refs. Signed-off-by: David

Re: [PATCH 0/5] Split .git/config in multiple worktree setup

On Wed, Dec 02, 2015 at 08:13:41PM +0100, Nguyễn Thái Ngọc Duy wrote: > Let's restart this. From the last discussion [1], we need to make > core.worktree per-worktree for submodules to work. We also need > core.sparseCheckout per-worktree. Thank you. It would be nice to have it, so that features

Re: [PATCH/RFC 04/10] ref-filter: skip deref specifier in match_atom_name()

On Wed, Dec 2, 2015 at 4:41 AM, Eric Sunshine wrote: > On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >> Signed-off-by: Karthik Nayak > > A bit of explanation about why this change is desirable would be > welcome. I'm

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

On Wed, Dec 02, 2015 at 07:29:40PM -0500, David Turner wrote: > From a selfish perspective, I, would prefer for object-ids to not happen > quite yet for the refs code. I have already prepared (but not yet sent) > a new version of the refs backend vtable (and lmdb) code on top of >

Re: [PATCH] ref-filter: mark some file-local functions static

Hello, On Thu, Dec 3, 2015 at 1:32 AM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Karthik, > > If you need to re-roll the patches in your 'kn/ref-filter-atom-parsing' > branch, could you please squash the relevant

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

On Wed, Dec 02, 2015 at 03:31:41PM -0800, Junio C Hamano wrote: > I just finished my first pass of going through "cook -w" output and > had trouble judging jk/send-email-ssl-errors topic, which is marked > as "waiting for re-roll", but I cannot seem to find any discussion > on it, just the

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

Jeff King writes: > On Tue, Nov 24, 2015 at 03:45:45PM +0100, SZEDER Gábor wrote: > >> git-sh-setup's require_clean_work_tree() always exits with error on an >> orphan branch, even when the index and worktree are both clean. The >> reason is that require_clean_work_tree() starts

Re: [PATCH] push: Improve --recurse-submodules support

Mike Crowe writes: > b33a15b08131514b593015cb3e719faf9db20208 added support for the > push.recurseSubmodules config option. After it was merged Junio C Hamano > suggested some improvements: > > - Declare recurse_submodules on a separate line. > > - Accept multiple

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

Jeff King writes: > On Wed, Dec 02, 2015 at 02:11:32PM -0800, Junio C Hamano wrote: > >> I think I managed to get my working area (together with a handful of >> new entries in the rerere database and a few merge-fix/ entries) in >> sync with what you pushed out well enough that my

Re: What's cooking in git.git (Dec 2015, #01; Tue, 1)

Jeff King writes: > On Wed, Dec 02, 2015 at 03:31:41PM -0800, Junio C Hamano wrote: > >> I just finished my first pass of going through "cook -w" output and >> had trouble judging jk/send-email-ssl-errors topic, which is marked >> as "waiting for re-roll", but I cannot seem to

Re: [RFC/PATCH 6/8] config: add core.untrackedCache

On Wed, Dec 2, 2015 at 8:12 AM, Torsten Bögershausen wrote: > On 12/01/2015 09:31 PM, Christian Couder wrote: >> >> When we know that mtime is fully supported by the environment, we >> might want the untracked cache to be always used by default without >> any mtime test or kernel

Re: [PATCH] git-send-email: Add auto-cc to all body signatures

On Thu, Dec 08 2011, Joe Perches wrote: > On Thu, 2011-12-08 at 11:37 -0800, Junio C Hamano wrote: >> Joe Perches writes: >> > Many types of signatures are used by various projects. >> > The most common type is formatted: >> >"[some_signature_type]-by:

Re: [PATCH v3] push: add recurseSubmodules config option

On Tuesday 01 December 2015 at 19:40:32 -0500, Jeff King wrote: > On Tue, Dec 01, 2015 at 11:49:43AM +, Mike Crowe wrote: > > > The --recurse-submodules command line parameter has existed for some > > time but it has no config file equivalent. > > > > Following the style of the corresponding

[PATCH] push: Improve --recurse-submodules support

b33a15b08131514b593015cb3e719faf9db20208 added support for the push.recurseSubmodules config option. After it was merged Junio C Hamano suggested some improvements: - Declare recurse_submodules on a separate line. - Accept multiple --recurse-submodules options on command line with the last

Re: [PATCH/RFC 06/10] strbuf: introduce strbuf_split_str_without_term()

On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > The current implementation of 'strbuf_split_buf()' includes the > terminator at the end of each strbuf post splitting. Include an option s/Include an/Add an/ > wherein we can drop the terminator if required. In this

Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am

On 12/02/2015 01:58 AM, Jeff King wrote: > On Wed, Nov 25, 2015 at 04:59:35PM +0100, huebbe wrote: > >> Yes, it looks like the `--keep-non-patch` option works around this. >> >> However, shouldn't that be the default behaviour? >> I mean, what is the point in stripping stuff that is not proven to

"git submodule sync --recursive" documentation omission

The git-submodule(1) is inconsistent. In the synopsis, it says: git submodule [--quiet] sync [--recursive] [--] [...] The description of the sync does not mention --recursive, and the description of --recursive says that it is only available for foreach, update and status. The option