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 guessing it's because a future patch is going to make
> calls to match_
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
l
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 parts of this patch into
> yours.
>
> Thanks!
Thanks, will
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
> refs-backend-pre
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 automated
>> pr
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
t/test-lib.sh |1 +
3 files change
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 is
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
---
builtin/init-db.c| 14 --
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 | 46 ++
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 100644
--- a/refs.c
+++ b/r
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 ha
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 -
refs/refs-internal.h | 2 +-
2 file
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.
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
---
builtin/init-db.c| 1 +
cache.h | 7 +++
refs.c
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
---
Documentation/git-clone
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs.c | 54
refs/files-backend.c | 41 +++
refs/refs-internal.h | 29
3 file
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 a8ed77d..e50516c 100644
--- a/refs.c
+++ b/refs.c
@@ -
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
---
ref
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 +++
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 refs/refs-inte
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 Turn
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
Signed-off-by: David Turner
-
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 in 'pu' (proposed
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 find any discussion
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 origina
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 automated
>> pr
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 --recurse-submodules options o
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 off with verifyi
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
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 'next'.
>
> This sho
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
> using the 'align' atom (
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".
diff --git a/t/t3404-rebase
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
cat
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 changed, 5 insertions(+), 5 deletio
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 pushing
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
> more than that on
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
---
gitk-git/gitk | 7
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 +11,7 @@ avoid_racy() {
> # It
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, const char **argv, const
> cha
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 use the working tree, you'll
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
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
+++ b/Documentation/git-work
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 Thá
.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 wor
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 core
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 | 4 +---
1 file chang
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 http://vger.kernel
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 u
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: First Last domain.tld
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
S
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 these signatures a
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 $GIT_DIR?"
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 either and I do
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 revert of
d95138e plea
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 li
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
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 specific
>> settings
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 ex
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 appe
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
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 version check bei
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: First Last "
>> > e.g:
>> >"Reporte
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 o
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
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 context
s/required/desi
65 matches
Mail list logo