Re: Single brackets matching in .gitignore rules

2015-09-28 Thread Junio C Hamano
Duy Nguyen writes: > This is already answered. I just want to add that C Git has stopped > using system fnmatch for some time (part of the reason is system > fnmatch behaves differently in corner cases). If you don't mind C, > have a look at dowild() in wildmatch.c, or

[no subject]

2015-09-28 Thread Kosta Zertsekel
subscribe git -- 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.org/majordomo-info.html

Re: Single brackets matching in .gitignore rules

2015-09-28 Thread Junio C Hamano
Andrey Loskutov writes: > On Monday 28 September 2015 10:40 Junio C Hamano wrote: >> Duy Nguyen writes: >> >> > This is already answered. I just want to add that C Git has stopped >> > using system fnmatch for some time (part of the reason is system >> >

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > >> When encountering broken symrefs, such as a stale remote HEAD (which can >> happen if the active branch was renamed in the remote), it is more >> helpful to remove those symrefs than to exit

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Johannes Schindelin
Hi Junio, On 2015-09-28 20:49, Junio C Hamano wrote: > Junio C Hamano writes: > >> Johannes Schindelin writes: >> >>> When encountering broken symrefs, such as a stale remote HEAD (which can >>> happen if the active branch was renamed in the

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Jeff King
On Mon, Sep 28, 2015 at 04:02:08PM +0200, Johannes Schindelin wrote: > @@ -136,7 +139,14 @@ int cmd_prune(int argc, const char **argv, const char > *prefix) > if (show_progress) > progress = start_progress_delay(_("Checking connectivity"), 0, > 0, 2); > > -

Re: [PATCH v8 0/7] git-p4: add support for large file systems

2015-09-28 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > diff to v7: > * fix commit message line length (thanks Junio) > * fix sync command for large file system support (thanks Luke!) > * add test case for sync command > * rename git-p4.pushLargeFiles to

Cannot setup gerrit 2.11.3 on clean ubuntu 15.04 machine

2015-09-28 Thread Kosta Zertsekel
Hi guys. I'd like to ask gerrit-related question. I hope you don't stone me to death for being on (formally) the wrong mailing list. I created clean ubuntu 15.04 (64 bit) virtual machine. Then I followed gerrit 2.11.3 installation documentation. The installation and initialization seem to be ok.

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Junio C Hamano
Johannes Schindelin writes: > When encountering broken symrefs, such as a stale remote HEAD (which can > happen if the active branch was renamed in the remote), it is more > helpful to remove those symrefs than to exit with an error. I think this depends on the

Re: git commit -a -m is not working

2015-09-28 Thread Jonathan Nieder
Hi, brian m. carlson wrote: > On Sat, Sep 26, 2015 at 09:51:12PM +0300, Alex Radulescu wrote: >> Alex:testGit Alex$ git commit -a -m 'made a change' >> >> On branch v1.0 >> >> Untracked files: >> >> new_branch.txt >> >> nothing added to commit but untracked files present > > git commit -a does

Re: [PATCH] ls-remote.txt: delete unsupported option

2015-09-28 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > -u has never been supported, but it was mentioned since > 0a2bb55 (git ls-remote: make usage string match manpage - > 2008-11-11). Nobody has complained about it for seven years, it's > probably safe to say nobody cares. So let's remove "-u" in

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-28 Thread Matthieu Moy
Matthieu Moy writes: > * If the tests always pass, nobody ever get any email from Travis-CI. Actually, I've just been reminded that the repository owner gets one email per new ref (tag, branch) by default. Deactivating completely email notification is as simple as

Re: Single brackets matching in .gitignore rules

2015-09-28 Thread Andrey Loskutov
On Monday 28 September 2015 10:40 Junio C Hamano wrote: > Duy Nguyen writes: > > > This is already answered. I just want to add that C Git has stopped > > using system fnmatch for some time (part of the reason is system > > fnmatch behaves differently in corner cases). If you

Re: broken racy detection and performance issues with nanosecond file times

2015-09-28 Thread Junio C Hamano
Karsten Blees writes: > Ideas for potential solutions: > == > > Performance issues: > --- > > 1. Compare file times in minimum supported precision >When comparing file times, use the minimum precision supported by >both

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-28 Thread Junio C Hamano
Matthieu Moy writes: > It probably makes sense to do the later in the case of Git, so that > Junio doesn't get spammed when pushing topic branches to > https://github.com/gitster/git. I won't enable it on github.com:gitster/git anyway, so I do not think that is a

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-28 Thread Stefan Beller
On Sun, Sep 27, 2015 at 5:11 AM, Matthieu Moy wrote: > > My experience with Travis-CI is that it just works I can second that. When I was contributing to other projects[1][2], Travis helped a lot. Currently I have a cronjob to get https://scan.coverity.com/ running

Re: broken racy detection and performance issues with nanosecond file times

2015-09-28 Thread Junio C Hamano
Karsten Blees writes: > Problem 1: Failure to detect racy files (without USE_NSEC) > == > > Git may not detect racy changes when 'update-index' runs in parallel > to work tree updates. > > Consider this (where

Why not git reset --hard ?

2015-09-28 Thread George Spelvin
I was applying an old forgotten stash to see if there were any edits in it I wanted to preserve, and my old changes to one file made no sense any more. I wanted to drop then all and keep the version in HEAD. I'd been using git reset after resolving conflicts, to leave the changes in the same

Re: Why not git reset --hard ?

2015-09-28 Thread Junio C Hamano
Jacob Keller writes: > On Mon, Sep 28, 2015 at 1:42 PM, Junio C Hamano wrote: >> "George Spelvin" writes: >>> I understand that "git reset --soft" makes no sense with a path, but >>> why not --hard? >> >> I do not think there is

Re: Why not git reset --hard ?

2015-09-28 Thread Theodore Ts'o
I personally have in my .gitconfig: [alias] revert-file = checkout HEAD -- I'm not sure revert-file is the best name, but it's what I've used because I've been contaminated by the concept/naming of "p4 revert", which I do use a fair amount to undo local edits for one or more files when

Re: Why not git reset --hard ?

2015-09-28 Thread Junio C Hamano
"George Spelvin" writes: > I was applying an old forgotten stash to see if there were any edits in > it I wanted to preserve, and my old changes to one file made no sense > any more. I wanted to drop then all and keep the version in HEAD. > > I'd been using git reset after

Re: Why not git reset --hard ?

2015-09-28 Thread Jacob Keller
On Mon, Sep 28, 2015 at 1:42 PM, Junio C Hamano wrote: > "George Spelvin" writes: >> I understand that "git reset --soft" makes no sense with a path, but >> why not --hard? > > I do not think there is anything fundamentally wrong for wishing for > "reset

[PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Johannes Schindelin
When encountering broken symrefs, such as a stale remote HEAD (which can happen if the active branch was renamed in the remote), it is more helpful to remove those symrefs than to exit with an error. This fixes https://github.com/git-for-windows/git/issues/423 Signed-off-by: Johannes Schindelin

[PATCH v2 2/4] pack-objects: do not get distracted by broken symrefs

2015-09-28 Thread Johannes Schindelin
It is quite possible for, say, a remote HEAD to become broken, e.g. when the default branch was renamed. We should still be able to pack our objects when such a thing happens; simply ignore broken symrefs (because they cannot matter for the packing process anyway). Signed-off-by: Johannes

[PATCH v2 1/4] gc: demonstrate failure with stale remote HEAD

2015-09-28 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- t/t6500-gc.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 63194d8..b736774 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -30,4 +30,19 @@ test_expect_success 'gc -h

[PATCH v2 3/4] mark_reachable_objects(): optionally collect broken symrefs

2015-09-28 Thread Johannes Schindelin
The behavior of `mark_reachable_objects()` without this patch is that it warns if it encounters a broken symref. Sometimes the caller wants to act upon broken symrefs, e.g. when garbage collecting in a repository with a broken remote HEAD. So let's introduce an optional parameter to collect

[PATCH] Fix "inside work tree" detection on case-insensitive filesystems

2015-09-28 Thread Johannes Schindelin
Git has a config variable to indicate that it is operating on a file system that is case-insensitive: core.ignoreCase. But the `dir_inside_of()` function did not respect that. As a result, if Git's idea of the current working directory disagreed in its upper/lower case with the `GIT_WORK_TREE`

[PATCH v2 0/4] Fix gc failure when a remote HEAD goes stale

2015-09-28 Thread Johannes Schindelin
There has been a report in the Git for Windows project that gc fails sometimes: https://github.com/git-for-windows/git/issues/423 It turns out that there are cases when a remote HEAD can go stale and it is not the user's fault at all. It can happen, for example, if the active branch in the remote

Re: [PATCH 60/68] prefer memcpy to strcpy

2015-09-28 Thread Rasmus Villemoes
On Thu, Sep 24 2015, Jeff King wrote: > This also eliminates calls to strcpy, which make auditing > the code base harder. Maybe may English parser is broken, but this doesn't immediately sound like what you meant to say. Also, in 29/68 you say "We drop calls to strcpy, which

[PATCH] ls-remote.txt: delete unsupported option

2015-09-28 Thread Nguyễn Thái Ngọc Duy
-u has never been supported, but it was mentioned since 0a2bb55 (git ls-remote: make usage string match manpage - 2008-11-11). Nobody has complained about it for seven years, it's probably safe to say nobody cares. So let's remove "-u" in documents instead of adding code to support it. While at

[PATCH/RFC] read-cache: fix file time comparisons with different precisions

2015-09-28 Thread Karsten Blees
Different git variants record file times in the index with different precisions, according to their capabilities. E.g. git compiled with NO_NSEC records seconds only, JGit records the mtime in milliseconds, but leaves ctime blank (because ctime is unavailable in Java). This causes performance

[PATCH v2 29/43] refs.c: add methods for reflog

2015-09-28 Thread David Turner
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-be-files.c |

[PATCH v2 36/43] run-command: track total number of commands run

2015-09-28 Thread David Turner
Soon, the db refs backend will use this to restart read transactions after subcommands which might have modified the refs database. Signed-off-by: David Turner --- run-command.c | 2 ++ run-command.h | 1 + 2 files changed, 3 insertions(+) diff --git a/run-command.c

[PATCH v2 26/43] refs.c: move peel_object to the common code

2015-09-28 Thread David Turner
This function does not contain any backend specific code so we move it to the common code. Signed-off-by: David Turner --- refs-be-files.c | 53 - refs.c | 31 +++ refs.h

[PATCH v2 42/43] refs: add LMDB refs backend

2015-09-28 Thread David Turner
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 v2 35/43] refs-be-files.c: add method to rename refs

2015-09-28 Thread David Turner
We also have to make rename_ref_available public, since alternate backends for rename_ref will need it. Signed-off-by: David Turner --- refs-be-files.c | 20 +++- refs.c | 21 + refs.h | 7 ++- 3 files changed,

[PATCH v2 33/43] refs.c: add method for initializing refs db

2015-09-28 Thread David Turner
Alternate refs backends might not need refs/heads and so on, so we make ref db initialization part of the backend. Signed-off-by: David Turner --- builtin/init-db.c | 14 -- refs-be-files.c | 17 + refs.c| 5 + refs.h

[PATCH v2 38/43] refs: make some files backend functions public

2015-09-28 Thread David Turner
Because HEAD and stash are per-worktree, other backends need to go through the files backend to manage these refs and their reflogs. To enable this, we make some files backend functions public. Signed-off-by: David Turner --- refs-be-files.c | 34

[PATCH v2 23/43] refs.c: move refname_is_safe to the common code

2015-09-28 Thread David Turner
This function does not contain any backend specific code so we move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 33 - refs.c | 23

[PATCH v2 41/43] refs: add register_refs_backend

2015-09-28 Thread David Turner
Add register_refs_backend, to allow refs backends to be registered. Signed-off-by: David Turner --- refs.c | 6 ++ refs.h | 1 + 2 files changed, 7 insertions(+) diff --git a/refs.c b/refs.c index 4f2ab25..4195657 100644 --- a/refs.c +++ b/refs.c @@ -18,6 +18,12

[PATCH v2 34/43] refs.c: make struct ref_transaction generic

2015-09-28 Thread David Turner
Alternate ref backends might need different data for transactions. Make struct ref_transaction an empty struct, and let backends define their own structs which extend it. Signed-off-by: David Turner --- refs-be-files.c | 24 +--- refs.h |

[PATCH v2 37/43] refs: move some defines from refs-be-files.c to refs.h

2015-09-28 Thread David Turner
This allows them to be used by other ref backends. Signed-off-by: David Turner --- refs-be-files.c | 24 refs.h | 24 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/refs-be-files.c

[PATCH v2 31/43] refs.c: add method for initial ref transaction commit

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

[PATCH v2 19/43] refs-be-files.c: add methods for misc ref operations

2015-09-28 Thread David Turner
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 --- cache.h

[PATCH v2 22/43] refs-be-files.c: add do_for_each_per_worktree_ref

2015-09-28 Thread David Turner
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

[PATCH v2 30/43] refs-be-files.c: add method to expire reflogs

2015-09-28 Thread David Turner
Signed-off-by: David Turner --- refs-be-files.c | 13 +++-- refs.c | 12 refs.h | 7 +++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index fdb47e0..93a5a33 100644 ---

[PATCH v2 40/43] refs: allow ref backend to be set for clone

2015-09-28 Thread David Turner
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 v2 24/43] refs.h: document make refname_is_safe and add it to header

2015-09-28 Thread David Turner
This function might be used by other refs backends Signed-off-by: David Turner --- refs.h | 11 +++ 1 file changed, 11 insertions(+) diff --git a/refs.h b/refs.h index 2bafa55..db60bfe 100644 --- a/refs.h +++ b/refs.h @@ -259,6 +259,17 @@ int

[PATCH v2 21/43] refs-be-files.c: add method for for_each_reftype_...

2015-09-28 Thread David Turner
Add method for for_each_reftype_fullpath. Signed-off-by: David Turner --- refs-be-files.c | 11 +++ refs.c | 7 +++ refs.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/refs-be-files.c b/refs-be-files.c index 9b45468..eb18a20

[PATCH v2 39/43] refs: break out a ref conflict check

2015-09-28 Thread David Turner
Create new function verify_no_descendants, to hold one of the ref conflict checks used in verify_refname_available. Multiple backends will need this function, so it goes in the common code. Signed-off-by: David Turner --- refs-be-files.c | 33

[PATCH v2 15/43] refs.c: move prettify_refname to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 9 - refs.c | 9 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index 58ff453..9c27851 100644 ---

[PATCH v2 32/43] initdb: move safe_create_dir into common code

2015-09-28 Thread David Turner
In a moment, we'll create initdb functions for ref backends, and code from initdb that calls this function needs to move into the files backend. So this function needs to be public. Signed-off-by: David Turner --- builtin/init-db.c | 12 cache.h

[PATCH v2 17/43] refs.c: move head_ref_namespaced to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 15 --- refs.c | 15 +++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index

[PATCH v2 12/43] refs.c: move resolve_refdup to common

2015-09-28 Thread David Turner
From: Ronnie Sahlberg This function can be shared across all refs backends so move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 7 --- refs.c | 7

Re: Why not git reset --hard ?

2015-09-28 Thread George Spelvin
Junio C Hamano wrote: > "George Spelvin" writes: >> "git checkout " modifies the index? >> >> Damn, I've been using git for years and I never knew that. > > ... which would be an indication that the behaviour is most likely > the most natural one. I think

[PATCH v2 09/43] refs.c: move dwim and friend functions to the common refs code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg These functions do not contain any backend specific code so we move them to the common code and share across all backends. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c

[PATCH v2 07/43] refs.c: move read_ref_at to the common refs file

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Move read_ref_at() to the refs.c file since this function does not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 118

[PATCH v2 16/43] refs.c: move ref iterators to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 82 - refs.c | 81 2 files changed, 81 insertions(+),

[PATCH v2 20/43] refs-be-files.c: add methods for the ref iterators

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 41 + refs.c | 54 ++

[PATCH v2 27/43] refs.c: move should_autocreate_reflog to common code

2015-09-28 Thread David Turner
Signed-off-by: David Turner --- refs-be-files.c | 10 -- refs.c | 10 ++ refs.h | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/refs-be-files.c b/refs-be-files.c index 5971526..37e244a 100644 ---

[PATCH v2 25/43] refs.c: move copy_msg to the common code

2015-09-28 Thread David Turner
Rename copy_msg to copy_reflog_msg and make it public. Signed-off-by: David Turner --- refs-be-files.c | 28 +--- refs.c | 26 ++ refs.h | 2 ++ 3 files changed, 29 insertions(+), 27 deletions(-) diff

[PATCH v2 18/43] refs-be-files.c: add a backend method structure with transaction functions

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Add a ref structure for backend methods. Start by adding method pointers for the transaction functions. Add a function set_refs_backend to switch between backends. The files based backend is the default. Signed-off-by: Ronnie Sahlberg

[PATCH v2 03/43] refs-be-files.c: rename refs to refs-be-files

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Rename refs.c to refs-be-files.c to indicate that this file now holds the implementation for the files based refs backend. A smaller portion of the code in this file is backend agnostic and will be moved to a a new refs.c file that will hold all the

[PATCH v2 13/43] refs.c: move check_refname_format to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg This function does not contain any backend specific code so we move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 109

[PATCH v2 00/43] lmdb ref backend

2015-09-28 Thread David Turner
This version rebases on top of pu. Mainly, this just moves a couple of methods to the backend. I added support for long symrefs to the lmdb backend. Peff added this to the files backend in pu, and there's a test for it. I cleaned up some formatting (long lines), and moved one patch to put it

[PATCH v2 02/43] refs: make repack_without_refs and is_branch public

2015-09-28 Thread David Turner
Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 9 + refs.h | 13 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/refs.c b/refs.c index ce551e9..2741cc5 100644 --- a/refs.c +++ b/refs.c

[PATCH 5/8] sigchain: add command to pop all common signals

2015-09-28 Thread Stefan Beller
The new method removes all common signal handlers that were installed by sigchain_push. CC: Jeff King Signed-off-by: Stefan Beller --- sigchain.c | 9 + sigchain.h | 1 + 2 files changed, 10 insertions(+) diff --git a/sigchain.c b/sigchain.c index

[PATCH 4/8] strbuf: add strbuf_read_once to read without blocking

2015-09-28 Thread Stefan Beller
The new call will read from a file descriptor into a strbuf once. The underlying call xread_nonblock is meant to execute without blocking if the file descriptor is set to O_NONBLOCK. It is a bug to call strbuf_read_once on a file descriptor which would block. Signed-off-by: Stefan Beller

[PATCH 2/8] xread: poll on non blocking fds

2015-09-28 Thread Stefan Beller
>From the man page: EAGAIN The file descriptor fd refers to a file other than a socket and has been marked nonblocking (O_NONBLOCK), and the read would block. EAGAIN or EWOULDBLOCK The file descriptor fd refers to a socket and has been marked nonblocking (O_NONBLOCK),

[PATCH 6/8] run-command: add an asynchronous parallel child processor

2015-09-28 Thread Stefan Beller
This allows to run external commands in parallel with ordered output on stderr. If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe, which we buffer. One subprocess can be directly

[PATCH 0/8] fetch submodules in parallel

2015-09-28 Thread Stefan Beller
Changes to v4: (diff below) * Some functions wanted to be static (Thanks Ramsay!) * The patch to factor out return code handling has been dropped as the return code handling is slightly different in finish_command and the parallel case. * We can handle signals a bit more gracefully now. * More

[PATCH 8/8] submodules: allow parallel fetching, add tests and documentation

2015-09-28 Thread Stefan Beller
This enables the work of the previous patches. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/fetch-options.txt | 7 +++ builtin/fetch.c | 6 +- builtin/pull.c | 6 ++

[PATCH 1/8] submodule.c: write "Fetching submodule " to stderr

2015-09-28 Thread Stefan Beller
From: Jonathan Nieder The "Pushing submodule " progress output correctly goes to stderr, but "Fetching submodule " is going to stdout by mistake. Fix it to write to stderr. Noticed while trying to implement a parallel submodule fetch. When this particular output line went

[PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

2015-09-28 Thread Stefan Beller
Provide a wrapper to read(), similar to xread(), that restarts on EINTR but not EAGAIN (or EWOULDBLOCK). This enables the caller to handle polling itself, possibly polling multiple sockets or performing some other action. Helped-by: Jacob Keller Helped-by: Jeff King

[PATCH 7/8] fetch_populated_submodules: use new parallel job processing

2015-09-28 Thread Stefan Beller
In a later patch we enable parallel processing of submodules, this only adds the possibility for it. So this change should not change any user facing behavior. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 126

[ANNOUNCE] Git v2.6.0

2015-09-28 Thread Junio C Hamano
The latest feature release Git v2.6.0 is now available at the usual places. It is comprised of 479 non-merge commits since v2.5.0, contributed by 67 people, 15 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories

A note from the maintainer

2015-09-28 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

Re: git commit -a -m is not working

2015-09-28 Thread Alex Radulescu
Hi, Thank you for your quick and precise support. Can you share with me some best practices in deploying a web project? I wave one remote repository, many local repositories (each/developer) and a shared hosting server. What should I do to push quickly all changes to my shared server? Alex

[PATCH v2 11/43] refs.c: move read_ref, read_ref_full and ref_exists to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg These functions do not depend on the backend implementation so we move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 18 --

[PATCH v2 28/43] refs.c: add ref backend init function

2015-09-28 Thread David Turner
The file backend doesn't need this function, but other backends might. Signed-off-by: David Turner Signed-off-by: Ronnie Sahlberg --- refs-be-files.c | 1 + refs.c | 4 +++- refs.h | 4 +++- 3 files changed, 7 insertions(+), 2

[PATCH v2 14/43] refs.c: move is_branch to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 5 - refs.c | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/refs-be-files.c

[PATCH v2 43/43] refs: tests for db backend

2015-09-28 Thread David Turner
Add tests for the database backend. Signed-off-by: David Turner --- t/t1460-refs-be-db.sh| 1103 ++ t/t1470-refs-be-db-reflog.sh | 353 ++ 2 files changed, 1456 insertions(+) create mode 100755

[PATCH v2 05/43] refs.c: move update_ref to refs.c

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Move update_ref() to the refs.c file since this function does not contain any backend specific code. Move the ref classifier functions as well, since update_ref depends on them. Based on Ronnie Sahlberg's patch Signed-off-by: Ronnie Sahlberg

[PATCH v2 08/43] refs.c: move the hidden refs functions to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Move the hidden refs functions to the refs.c file since these functions do not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 51

[PATCH v2 06/43] refs.c: move delete_ref and delete_refs to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Move delete_pseudoref, delete_ref() and delete_refs() to the refs.c file since these functions do not contain any backend specific code. Based on a patch by Ronnie Sahlberg. Signed-off-by: David Turner Signed-off-by: Ronnie

[PATCH v2 04/43] refs.c: add a new refs.c file to hold all common refs code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Create a new refs.c file that will be used to hold all the refs code that is backend agnostic and will be shared across all backends. Signed-off-by: Ronnie Sahlberg --- Makefile | 1 + refs.c | 3 +++ 2 files changed, 4

[PATCH v2 10/43] refs.c: move warn_if_dangling_symref* to the common code

2015-09-28 Thread David Turner
From: Ronnie Sahlberg These functions do not use any backend specific code so we move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs-be-files.c | 52

[PATCH v2 01/43] refs.c: create a public version of verify_refname_available

2015-09-28 Thread David Turner
From: Ronnie Sahlberg Create a public version of verify_refname_available that backends can provide. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 51

Re: Why not git reset --hard ?

2015-09-28 Thread George Spelvin
Junio C Hamano wrote: > "git checkout HEAD " is a 99% acceptable substitute for it > (the only case where it makes a difference is when you added a path to > the index that did not exist in HEAD). Er, wait a minute... "git checkout " modifies the index? Damn, I've been

Re: Why not git reset --hard ?

2015-09-28 Thread Junio C Hamano
"George Spelvin" writes: > Junio C Hamano wrote: >> "git checkout HEAD " is a 99% acceptable substitute for it >> (the only case where it makes a difference is when you added a path to >> the index that did not exist in HEAD). > > Er, wait a minute... > >

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-28 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> It probably makes sense to do the later in the case of Git, so that >> Junio doesn't get spammed when pushing topic branches to >> https://github.com/gitster/git. > > I won't enable it on

[PATCH] clone --dissociate: avoid locking pack files

2015-09-28 Thread Johannes Schindelin
When `git clone` is asked to dissociate the repository from the reference repository whose objects were used, it is quite possible that the pack files need to be repacked. In that case, the pack files need to be deleted that were originally hard-links to the reference repository's pack files. On

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-09-28 Thread Johannes Schindelin
Hi Peff, On 2015-09-28 21:03, Jeff King wrote: > On Mon, Sep 28, 2015 at 04:02:08PM +0200, Johannes Schindelin wrote: > >> @@ -136,7 +139,14 @@ int cmd_prune(int argc, const char **argv, const char >> *prefix) >> if (show_progress) >> progress =

[PATCH v4 0/6] fix local clone from a linked checkout

2015-09-28 Thread Nguyễn Thái Ngọc Duy
This fixes another embarassing bug in 4/6 and adds tests to make sure it works. Changes since v3 -- 8< -- diff --git a/path.c b/path.c index 32d4ca6..a346134 100644 --- a/path.c +++ b/path.c @@ -439,7 +439,7 @@ const char *enter_repo(const char *path, int strict) path =

[PATCH v4 1/6] path.c: delete an extra space

2015-09-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/path.c b/path.c index 95acbaf..a536ee3 100644 --- a/path.c +++ b/path.c @@ -431,7 +431,7 @@ const char *enter_repo(const char *path, int strict) }

[PATCH v4 3/6] enter_repo: avoid duplicating logic, use is_git_directory() instead

2015-09-28 Thread Nguyễn Thái Ngọc Duy
It matters for linked checkouts where 'refs' directory won't be available in $GIT_DIR. is_git_directory() knows about $GIT_COMMON_DIR and can handle this case. Signed-off-by: Nguyễn Thái Ngọc Duy --- path.c | 3 +-- t/t0002-gitfile.sh | 14 ++ 2 files

[PATCH v4 2/6] t0002: add test for enter_repo(), non-strict mode

2015-09-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t0002-gitfile.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index 9393322..545bfe2 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -116,4 +116,22 @@

[PATCH v4 4/6] enter_repo: allow .git files in strict mode

2015-09-28 Thread Nguyễn Thái Ngọc Duy
Strict mode is about not guessing where .git is. If the user points to a .git file, we know exactly where the target .git dir will be. This makes it possible to serve .git files as repository on the server side. This may be needed even in local clone case because transport.c code uses upload-pack

[PATCH v4 5/6] clone: allow --local from a linked checkout

2015-09-28 Thread Nguyễn Thái Ngọc Duy
Noticed-by: Bjørnar Snoksrud Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/clone.c | 6 -- t/t2025-worktree-add.sh | 5 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index

Re: [PATCH/RFC] read-cache: fix file time comparisons with different precisions

2015-09-28 Thread Johannes Schindelin
Hi Karsten, On 2015-09-28 12:39, Karsten Blees wrote: > Different git variants record file times in the index with different > precisions, according to their capabilities. E.g. git compiled with NO_NSEC > records seconds only, JGit records the mtime in milliseconds, but leaves > ctime blank

  1   2   >