Re: [PATCH 00/11] More preparatory work for multiparent tree-walker

2014-02-10 Thread Junio C Hamano
Kirill Smelkov writes: > Here I'm preparing tree-diff.c to be ready for the new tree-walker, so that > the > final change is tractable and looks good and non noisy. Some small speedups > are gained along the way. The final bits are almost ready, but I don't want to > release them in a hurry. No

Re: [PATCH v4 7/9] rebase: parse options in stuck-long mode

2014-02-10 Thread brian m. carlson
On Mon, Feb 10, 2014 at 01:59:02AM -0500, Eric Sunshine wrote: > On Sun, Feb 9, 2014 at 8:03 PM, brian m. carlson > wrote: > > From: Nicolas Vigier > > > > There is no functionnal change. The reason for this change is to be able > > s/functionnal/functional/ I could have sworn I fixed that typo

Re: [PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option

2014-02-10 Thread Junio C Hamano
"Albert L. Lash, IV" writes: > Current text claims optimization, implying the use of > hardlinks, when this option ratchets down the level of > efficiency. This change explains the difference made by > using this option, namely copying instead of hardlinking, > and why it may be useful. > > Signe

Re: [PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use

2014-02-10 Thread Junio C Hamano
"Albert L. Lash, IV" writes: > We state that the following paragraph mentions the pickaxe > interface, but the term pickaxe is not then used. This > change clarifies that the example command uses the pickaxe > interface and what it is searching for. > > Signed-off-by: Albert L. Lash, IV > --- >

Re: [PATCH v3 00/26] inotify support

2014-02-10 Thread Duy Nguyen
On Mon, Feb 10, 2014 at 11:55 PM, Torsten Bögershausen wrote: > On 2014-02-10 11.37, Duy Nguyen wrote: >>> >>> Could we use relative path names internally, relative to $GIT_DIR ? >> >> No because this is when the client tell the server about $GIT_DIR. I >> guess we can use realpath(1) here. > Good

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Duy Nguyen
On Tue, Feb 11, 2014 at 1:46 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> diff --git a/setup.c b/setup.c >> index 6c3f85f..b09a412 100644 >> --- a/setup.c >> +++ b/setup.c >> @@ -787,3 +787,27 @@ void sanitize_stdfds(void) >> if (fd > 2) >> close(fd); >> } >

[PATCH] tests: turn on network daemon tests by default

2014-02-10 Thread Jeff King
We do not run the httpd nor git-daemon tests by default, as they are rather heavyweight and require network access (albeit over localhost). However, it would be nice if more pepole ran them, for two reasons: 1. We would get more test coverage on more systems. 2. The point of the test suite is

Re: [GIT PULL] l10n updates for 1.9.0 round 2

2014-02-10 Thread Junio C Hamano
Thansk. -- 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: [PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges

2014-02-10 Thread Junio C Hamano
Thanks. -- 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: [PATCH v5 02/14] trailer: process trailers from file and arguments

2014-02-10 Thread Junio C Hamano
Christian Couder writes: > Many entries with the same key but distinct values can be configured > using: > > if_exists = add_if_different > if_missing = add > > Many entries with the same key but values that can be the same can be > configured using: > > if_exists = add > if_missing = add While

Re: [PATCH v5 02/14] trailer: process trailers from file and arguments

2014-02-10 Thread Christian Couder
From: Junio C Hamano Subject: Re: [PATCH v5 02/14] trailer: process trailers from file and arguments Date: Mon, 10 Feb 2014 10:14:34 -0800 > Christian Couder writes: > >> This is what "if_exists" and "if_missing" are all about. >> >> Either: >> >> the same key already exists regardless of

Re: [PATCH] hashmap.h: make sure map entries are tightly packed

2014-02-10 Thread Junio C Hamano
Karsten Blees writes: > ... At the very least we shouldn't > stall the rest of the patch series on a hunch that the last > (unfortunately non-standard) patch may break on some legacy > system. Oh, no question about it. I was planning split out the last one and merge the rest to 'master' after t

Re: [PATCH v2 2/2] gc: config option for running --auto in background

2014-02-10 Thread Junio C Hamano
On Mon, Feb 10, 2014 at 10:43 AM, Junio C Hamano wrote: >> If --quiet is set, we should not be printing anyway. If not, I thinkg >> we could only print "auto packing in background.." when we actually >> can do that, else just print the old message. It means an #ifdef >> NO_POSIX_GOODIES here again

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
On Mon, Feb 10, 2014 at 10:23:53AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Here it is as a Real Patch™. I just based it on master, so it can > > replace your 5537/5538 fix in your series. > > Thanks, looks good. Will put this at the bottom and rebuild the > nd/http-fetch-shallow

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
On Mon, Feb 10, 2014 at 02:15:24PM -0500, Jeff King wrote: > Thanks. It might be worth squashing in the patch below (or sticking it > on top), to cover git-daemon as well. Patch would probably be easier to read if I actually included it... -- >8 -- Subject: [PATCH] tests: auto-set git-daemon por

Re: Documentation about "push.default=upstream" is confusing

2014-02-10 Thread Junio C Hamano
Ingo Rohloff writes: > To handle that I setup several remote tracking branches called: > repo1_master (tracks repo1/master) > repo2_master (tracks repo2/master) > reap3_master (tracks repo3/master) > > Now without "push.default=upstream" I would have to either always explicitly > do s

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/setup.c b/setup.c > index 6c3f85f..b09a412 100644 > --- a/setup.c > +++ b/setup.c > @@ -787,3 +787,27 @@ void sanitize_stdfds(void) > if (fd > 2) > close(fd); > } > + > +int daemonize(void) > +{ > +#ifdef NO_POSIX_GOODIES > + e

Re: [PATCH v2 2/2] gc: config option for running --auto in background

2014-02-10 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Feb 10, 2014 at 6:03 PM, Erik Faye-Lund wrote: >>> `gc --auto` takes time and can block the user temporarily (but not any >>> - if (!quiet) >>> - fprintf(stderr, >>> - _("Auto packing the repos

Re: bash completion patch

2014-02-10 Thread Junio C Hamano
Thomas Rast writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> > [...] >>> don't forget to Cc Junio if >>> you think your patch is ready for inclusion. >> >> Heh, thanks. Everybody seems to think anything they send out to the >> list is ready for inclusion, so the last part may not

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Junio C Hamano
Jeff King writes: > Here it is as a Real Patch™. I just based it on master, so it can > replace your 5537/5538 fix in your series. Thanks, looks good. Will put this at the bottom and rebuild the nd/http-fetch-shallow-fix series on top. > 1. Is there anybody who has apache installed who would

Re: [PATCH 6/6] fetch-pack: fix deepen shallow over smart http with no-done cap

2014-02-10 Thread Junio C Hamano
Duy Nguyen writes: > On Fri, Feb 07, 2014 at 10:01:08AM -0800, Junio C Hamano wrote: >> Here is the difference between the posted series and what I queued >> after applying the changes suggested during the review. >> >> Thanks. > > I was going to send a reroll after the received comments. Could

Re: [PATCH v5 02/14] trailer: process trailers from file and arguments

2014-02-10 Thread Junio C Hamano
Christian Couder writes: > This is what "if_exists" and "if_missing" are all about. > > Either: > > the same key already exists regardless of the value > > and, in this case, what happens depends on what has been specified using > the "if_exists" configuration variable. > > Or: > > th

Re: [PATCH] bash completion: Add --recurse-submodules

2014-02-10 Thread Keshav Kini
Sup Yut Sum writes: > Signed-off-by: Sup Yut Sum > --- > contrib/completion/git-completion.bash | 19 ++- > 1 file changed, 18 insertions(+), 1 deletion(-) Aren't you missing a commit message? -Keshav -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

Re: [PATCH v3 00/26] inotify support

2014-02-10 Thread Torsten Bögershausen
On 2014-02-10 11.37, Duy Nguyen wrote: >> >> Could we use relative path names internally, relative to $GIT_DIR ? > > No because this is when the client tell the server about $GIT_DIR. I > guess we can use realpath(1) here. Good. I realized that the watcher can watch several repos at the same time

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
On Sat, Feb 08, 2014 at 02:36:11PM +0700, Duy Nguyen wrote: > > Thinking on this more, I wonder if we should just do something like > > this: > [...] > Yes! Here it is as a Real Patch™. I just based it on master, so it can replace your 5537/5538 fix in your series. > Next stop, attempt to start

Re: [PATCH v2 2/2] gc: config option for running --auto in background

2014-02-10 Thread Erik Faye-Lund
On Mon, Feb 10, 2014 at 2:17 PM, Duy Nguyen wrote: > On Mon, Feb 10, 2014 at 6:03 PM, Erik Faye-Lund wrote: >>> `gc --auto` takes time and can block the user temporarily (but not any >>> - if (!quiet) >>> - fprintf(stderr, >>> -

Re: [PATCH v2 2/2] gc: config option for running --auto in background

2014-02-10 Thread Duy Nguyen
On Mon, Feb 10, 2014 at 6:03 PM, Erik Faye-Lund wrote: >> `gc --auto` takes time and can block the user temporarily (but not any >> - if (!quiet) >> - fprintf(stderr, >> - _("Auto packing the repository for >> optimum perfo

Re: attr.c doesn't honor --work-tree option

2014-02-10 Thread Lasse Makholm
On 6 February 2014 18:54, Junio C Hamano wrote: > Lasse Makholm writes: > >> Here's a repro with -DDEBUG_ATTR=1 and a printf() in read_attr_from_file(): >> >> $ cd /tmp/ >> $ mkdir -p attr-test/repo >> $ cd attr-test/repo >> $ git init >> Initialized empty Git repository in /tmp/attr-test/repo/.g

Re: gitweb.cgi bug

2014-02-10 Thread Dongsheng Song
On Mon, Feb 10, 2014 at 12:06 AM, Andrew Keller wrote: > On Feb 8, 2014, at 10:19 PM, Dongsheng Song wrote: >> On Sun, Feb 9, 2014 at 12:29 AM, Andrew Keller wrote: >>> On Feb 8, 2014, at 8:37 AM, Dongsheng Song wrote: >>> I have an git repo PROJECT.git, the full path is /srv/repo/git/PROJEC

Re: [PATCH v2 1/2] daemon: move daemonize() to libgit.a

2014-02-10 Thread Erik Faye-Lund
On Sat, Feb 8, 2014 at 8:08 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > diff --git a/setup.c b/setup.c > index 6c3f85f..b09a412 100644 > --- a/setup.c > +++ b/setup.c > @@ -787,3 +787,27 @@ void sanitize_stdfds(void) > if (fd > 2) > close(fd); >

[BUG] git-stash confused when directory replaced with symlink

2014-02-10 Thread Vovan-VE
Hello! Looks like a bug. `git stash` fails with fatal error, when whole subdirectory is replaced with a symlink. I'm using latest Git/1.8.5.4 under Ubuntu 12.04.4 x64. Steps to reproduce initial state: $ git init $ mkdir dir $ touch dir/file.txt $ git add dir/file.txt $

Re: [PATCH v2 2/2] gc: config option for running --auto in background

2014-02-10 Thread Erik Faye-Lund
On Sat, Feb 8, 2014 at 8:08 AM, Nguyễn Thái Ngọc Duy wrote: > `gc --auto` takes time and can block the user temporarily (but not any > less annoyingly). Make it run in background on systems that support > it. The only thing lost with running in background is printouts. But > gc output is not reall

Re: [PATCH v3 00/26] inotify support

2014-02-10 Thread Duy Nguyen
On Mon, Feb 10, 2014 at 3:19 AM, Torsten Bögershausen wrote: > Please see filewatcher.c: > + if (daemon) { > + int err; > + strbuf_addf(&sb, "%s/log", socket_path); > + err = open(sb.buf, O_CREAT | O_TRUNC | O_WRONLY, 0600); > + adjust_