Re: [PATCHv4 06/14] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > +static void pp_buffer_stderr(struct parallel_processes *pp) > +{ > + int i; > + > + while ((i = poll(pp->pfd, pp->max_processes, 100)) < 0) { > + if (errno == EINTR) > + continue; > + pp_cleanup(pp); > + die_

Re: [PATCHv4 06/14] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > run-command.c | 264 > + > run-command.h | 36 +++ > t/t0061-run-command.sh | 20 > test-run-command.c | 24 + > 4 files changed, 344 insertions(+) I think we are almost there, but the

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Jeff King
On Tue, Sep 22, 2015 at 05:14:42PM -0700, Stefan Beller wrote: > We should not care if the call to poll failed, as we're in an infinite loop > and > can only get out with the correct read(..). So maybe an implementation like > this > would already suffice: > > ssize_t xread(int fd, void *buf, s

[PATCHv4 07/14] fetch_populated_submodules: use new parallel job processing

2015-09-22 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 --- submodule.c | 119 +++- 1 file changed, 85 inse

[PATCHv4 13/14] git submodule update: cmd_update_fetch

2015-09-22 Thread Stefan Beller
Split the fetching part out to its own function, this allow us in a later patch to convert cmd_update in C. Signed-off-by: Stefan Beller --- git-submodule.sh | 164 --- 1 file changed, 84 insertions(+), 80 deletions(-) diff --git a/git-submodu

[PATCHv4 05/14] run-command: factor out return value computation

2015-09-22 Thread Stefan Beller
We will need computing the return value in a later patch without the wait. Signed-off-by: Stefan Beller --- run-command.c | 56 ++-- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/run-command.c b/run-command.c index 28e1d55..2b

[PATCHv4 10/14] submodule config: keep update strategy around

2015-09-22 Thread Stefan Beller
We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 11 +++ submodule-config.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule-config.c b/submodule-config.c index afe0ea8..8b8c7d1 100644 --- a/submodule-config.

[PATCHv4 11/14] git submodule update: cmd_update_recursive

2015-09-22 Thread Stefan Beller
Split the recursion part out to its own function, this allow us in a later patch to convert cmd_update in C. Signed-off-by: Stefan Beller --- git-submodule.sh | 47 ++- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/git-submodule.sh b/

[PATCHv4 14/14] Rewrite submodule update in C

2015-09-22 Thread Stefan Beller
This will make parallelisation easier in a followup patch. This is just a translation from shell to C, hopefully not introducing any bugs. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 251 git-submodule.sh| 135 +-

[PATCHv4 06/14] run-command: add an asynchronous parallel child processor

2015-09-22 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 pi

[PATCHv4 09/14] submodule-config: Untangle logic in parse_config

2015-09-22 Thread Stefan Beller
CC: Eric Sunshine Signed-off-by: Stefan Beller --- submodule-config.c | 74 +- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/submodule-config.c b/submodule-config.c index 393de53..afe0ea8 100644 --- a/submodule-config.c +++ b/

[PATCHv4 02/14] xread: poll on non blocking fds

2015-09-22 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), a

[PATCHv4 08/14] submodules: allow parallel fetching, add tests and documentation

2015-09-22 Thread Stefan Beller
This enables the work of the previous patches. Signed-off-by: Stefan Beller --- Documentation/fetch-options.txt | 7 +++ builtin/fetch.c | 6 +- builtin/pull.c | 6 ++ submodule.c | 3 +-- submodule.h | 2 +

[PATCHv4 12/14] git submodule update: cmd_update_clone

2015-09-22 Thread Stefan Beller
Split the cloning part out to its own function, this allow us in a later patch to convert cmd_update in C. Signed-off-by: Stefan Beller --- git-submodule.sh | 31 --- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh i

[PATCHv4 04/14] strbuf: add strbuf_read_once to read without blocking

2015-09-22 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 --- str

[PATCHv4 01/14] submodule: Send "Fetching submodule " to standard error

2015-09-22 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 to a different file de

[PATCHv4 03/14] xread_nonblock: add functionality to read from fds without blocking

2015-09-22 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 , Helped-by: Junio C Hamano S

[PATCHv4 00/14] fetch submodules in parallel and a preview on parallel "submodule update"

2015-09-22 Thread Stefan Beller
Today there was lots of discussion on the correct way of reading the strbufs as well as some discussion on the structure of the asynchronous parallel process loop. Patches 1-8 bring parallel fetching of submodules, and have had some good exposure to review and feedback is incorporated. Patches 9

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > We should not care if the call to poll failed, as we're in an infinite loop > and > can only get out with the correct read(..). I think I agree with that reasoning. The only thing we want out of this call to poll(2) is to delay calling read(2) again when we know we woul

Re: [PATCH] git-svn: make batch mode optional for git-cat-file

2015-09-22 Thread Eric Wong
Eric Wong wrote: > Victor Leschuk wrote: > > The thing is that git-cat-file keeps growing during work when running > > in "batch" mode. See the figure attached: it is for cloning a rather > > small repo (1 hour to clone about ~14000 revisions). However the clone > > of a large repo (~28 revis

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Stefan Beller
On Tue, Sep 22, 2015 at 1:00 PM, Junio C Hamano wrote: > Jeff King writes: > >> On Tue, Sep 22, 2015 at 12:45:51PM -0700, Junio C Hamano wrote: >> >>> One caveat is that the caller may not know in the first place. >>> >>> The last time I checked the existing callers of xread(), there were >>> a f

Re: [PATCH] git-svn: make batch mode optional for git-cat-file

2015-09-22 Thread Eric Wong
Victor Leschuk wrote: > The thing is that git-cat-file keeps growing during work when running > in "batch" mode. See the figure attached: it is for cloning a rather > small repo (1 hour to clone about ~14000 revisions). However the clone > of a large repo (~28 revisions) took about 2 weeks and

t5561 failing after make PROFILE=GEN

2015-09-22 Thread Stephan Beyer
Hi, I noticed that t5561 fails on my machine when compiling with "make PROFILE=GEN". Luckily, the reason seems to be the test only, not the tool it is testing. I tracked it down that far that log_div() (defined in t/t5561-http-backend.sh but used in t/t556x_common) appends the given text to the a

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Sep 22, 2015 at 2:41 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> On Tue, Sep 22, 2015 at 12:53 PM, Junio C Hamano wrote: Stefan Beller writes: > So how would you find out when we are done? while (1) {

[PATCH v2] notes: correct documentation of DWIMery for notes references

2015-09-22 Thread Jacob Keller
From: Jacob Keller expand_notes_ref is used by --ref from git-notes(1) and --notes from the git log to find the full refname of a notes reference. Previously the documentation of these options was not clear about what sorts of expansions would be performed. Fix the documentation to clearly and ac

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

2015-09-22 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > diff to v6: > * fix spaces in .gitattributes for Git-LFS files (old "[:space:]", new > "[[:space:]]") > * generated patch on top of next (95c4325) to resolve merge conflicts > > I am sorry about the "[:space:]" bug this late. I had the

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Stefan Beller
On Tue, Sep 22, 2015 at 2:41 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Tue, Sep 22, 2015 at 12:53 PM, Junio C Hamano wrote: >>> Stefan Beller writes: >>> So how would you find out when we are done? >>> >>> while (1) { >>> if (we have available slot)

Re: [PATCH v7 1/7] git-p4: add optional type specifier to gitConfig reader

2015-09-22 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > The functions “gitConfig” and “gitConfigBool” are almost identical. Make > “gitConfig” more generic by adding an optional type specifier. Use the type > specifier “—bool” with “gitConfig” to implement “gitConfigBool. This prepares > t

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Sep 22, 2015 at 12:53 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> So how would you find out when we are done? >> >> while (1) { >> if (we have available slot) >> ask to start a new one; >>

Re: [PATCH] Makefile: Change library order for static linking

2015-09-22 Thread Junio C Hamano
Remi Pommarel writes: > I have one last question thought. Wouldn't it be nice if we had > configure to autodetect the need for -lssl with libcurl? Sure. I do not think anybody tried, but it would be nice. > We could make > configure to check for Curl_ssl_init function symbol in libcurl, > whic

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Stefan Beller
On Tue, Sep 22, 2015 at 12:53 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> So how would you find out when we are done? > > while (1) { > if (we have available slot) > ask to start a new one; > if (nobody is running anymore)

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Junio C Hamano
"Keller, Jacob E" writes: > On Tue, 2015-09-22 at 13:40 -0700, Junio C Hamano wrote: >> How about phrasing it totally differently? >> >> The ref specifies the full refname when it begins with >> `refs/notes/`; otherwise `ref/notes/` is prefixed to form a >> full name of the ref. >

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Keller, Jacob E
On Tue, 2015-09-22 at 13:40 -0700, Junio C Hamano wrote: > How about phrasing it totally differently? > > The ref specifies the full refname when it begins with > `refs/notes/`; otherwise `ref/notes/` is prefixed to form a > full name of the ref. > > I think that would remove th

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Keller, Jacob E
On Tue, 2015-09-22 at 13:40 -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > From: Jacob Keller > > > > The --notes and --ref parameter for selecting which notes ref to > > operate > > on are based off of expand_notes_ref functionality. The > > documentation > > mentioned that an unqua

Re: Unable to create temporary file '/var/git/tmv3-target-overlay.git/shallow_Un8ZOR': Permission denied

2015-09-22 Thread Joakim Tjernlund
On Tue, 2015-09-22 at 22:00 +0200, Johannes Schindelin wrote: > Hi Joakim, > > On 2015-09-21 19:08, Joakim Tjernlund wrote: > > On Mon, 2015-09-21 at 09:48 -0700, Junio C Hamano wrote: > > > Duy Nguyen writes: > > > > > > > Is it really necessary to remove write access in $GIT_DIR? Do we (git >

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Junio C Hamano
Theodore Ts'o writes: > On Tue, Sep 22, 2015 at 04:11:23PM -0400, Josh Boyer wrote: >> Oh, context would help, yes. In the case of the tree I'm parsing, I >> know for a fact that the commit history is entirely linear and will >> (should) always remain so. E.g. >> >> A - B - C - D - E - F ... {

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Theodore Ts'o
On Tue, Sep 22, 2015 at 04:11:23PM -0400, Josh Boyer wrote: > Oh, context would help, yes. In the case of the tree I'm parsing, I > know for a fact that the commit history is entirely linear and will > (should) always remain so. E.g. > > A - B - C - D - E - F ... {N} > > So yes, finding e.g. th

Re: [PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Junio C Hamano
Jacob Keller writes: > From: Jacob Keller > > The --notes and --ref parameter for selecting which notes ref to operate > on are based off of expand_notes_ref functionality. The documentation > mentioned that an unqualified ref argument would be taken as under > `refs/notes/`. However, this does

Re: [PATCH] Makefile: Change library order for static linking

2015-09-22 Thread Remi Pommarel
On Mon, Sep 21, 2015 at 10:09:52AM -0700, Junio C Hamano wrote: > I think I said this already, but I found these bits from your patch > > - $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) > + $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS) > > that first uses libcurl and then libs (wh

[PATCH] notes: document behavior of --ref and --notes DWIMery

2015-09-22 Thread Jacob Keller
From: Jacob Keller The --notes and --ref parameter for selecting which notes ref to operate on are based off of expand_notes_ref functionality. The documentation mentioned that an unqualified ref argument would be taken as under `refs/notes/`. However, this does not clearly indicate that `refs/he

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Josh Boyer
On Tue, Sep 22, 2015 at 3:55 PM, Junio C Hamano wrote: > Josh Boyer writes: > >> On Tue, Sep 22, 2015 at 2:40 PM, Konstantin Khomoutov >> ... >>> Hence, given any particular commit, you're able to trace all of its >>> ancestry, but the reverse is not possible. >> >> That makes sense. I suppose I

Re: Unable to create temporary file '/var/git/tmv3-target-overlay.git/shallow_Un8ZOR': Permission denied

2015-09-22 Thread Johannes Schindelin
Hi Joakim, On 2015-09-21 19:08, Joakim Tjernlund wrote: > On Mon, 2015-09-21 at 09:48 -0700, Junio C Hamano wrote: >> Duy Nguyen writes: >> >> > Is it really necessary to remove write access in $GIT_DIR? Do we (git >> > devs) have some guidelines about things in $GIT_DIR? >> >> Those who are allo

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Junio C Hamano
Jeff King writes: > On Tue, Sep 22, 2015 at 12:45:51PM -0700, Junio C Hamano wrote: > >> One caveat is that the caller may not know in the first place. >> >> The last time I checked the existing callers of xread(), there were >> a few that read from a file descriptor they did not open themselves

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Junio C Hamano
Josh Boyer writes: > On Tue, Sep 22, 2015 at 2:40 PM, Konstantin Khomoutov > ... >> Hence, given any particular commit, you're able to trace all of its >> ancestry, but the reverse is not possible. > > That makes sense. I suppose I will have to resort to parsing output > of git-rev-list or somet

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > So how would you find out when we are done? while (1) { if (we have available slot) ask to start a new one; if (nobody is running anymore) break; collect the output fro

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Jeff King
On Tue, Sep 22, 2015 at 12:45:51PM -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > I don't think this patch actually changes behavior as it stands now. I > > think Junio's suggestion does. Personally, I'd prefer some sort of > > warning when you use xread and get EAGAIN or EWOULDBLOCK.

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Junio C Hamano
Jacob Keller writes: > I don't think this patch actually changes behavior as it stands now. I > think Junio's suggestion does. Personally, I'd prefer some sort of > warning when you use xread and get EAGAIN or EWOULDBLOCK. I'd rather > see it somehow warn so that we can find the bug (since we rea

Re: [PATCH v8 4/4] worktree: add 'list' command

2015-09-22 Thread Junio C Hamano
Michael Rappazzo writes: > > +--porcelain:: > + With `list`, output in an easy-to-parse format for scripts. > + This format will remain stable across Git versions and regardless of > user > + configuration. ... and exactly what does it output? That would be the first question a r

[PATCH] Fixed typo in Doc/gitrepository-layout

2015-09-22 Thread Lapshin Dmitry
From: LDVSOFT gitrepository-layout.txt: In description of `info' directory, note about `$GIT_COMMON_DIR' was referencing `index' instead of `info'. Signed-off-by: LDVSOFT --- Documentation/gitrepository-layout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docu

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Junio C Hamano
Yup, this was privately reported and I just squashed a fix in right now ;-) Thanks. "cd t && make test-lint" would have caught it. On Tue, Sep 22, 2015 at 12:11 PM, Michael Blume wrote: > I'm seeing test failures > > non-executable tests: t9825-git-p4-handle-utf16-without-bom.sh > > ls -l shows

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Michael Blume
I'm seeing test failures non-executable tests: t9825-git-p4-handle-utf16-without-bom.sh ls -l shows that all the other tests are executable but t9825 isn't. On Tue, Sep 22, 2015 at 9:02 AM, Junio C Hamano wrote: > Lars Schneider writes: > >> This works. > > OK, and thanks; as I don't do perfor

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Josh Boyer
On Tue, Sep 22, 2015 at 2:40 PM, Konstantin Khomoutov wrote: > On Tue, 22 Sep 2015 14:32:19 -0400 > Josh Boyer wrote: > >> Please CC me as I'm not subscribed. >> >> I was hoping someone could help me with the revision shorthand to get >> the commit sha of a commit N commits after the initial comm

Re: [PATCH 1/2] notes: don't expand qualified refs in expand_notes_ref

2015-09-22 Thread Jacob Keller
On Tue, Sep 22, 2015 at 11:37 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> The other issue here is that expand_notes_ref is called on the --ref >> argument waaay before the current code even decides if the operation >> is "read" or "write". Thus we'd have to break this out and handle >>

git-svn aborts with "Use of uninitialized value $u" when a non-svn-backed branch is present in remote

2015-09-22 Thread Jacob Godserv
I found a specific case in which git-svn improperly aborts: 1. I created a git-svn repository, named "git-svn repo", by cloned an svn repository via the git-svn tool. 2. I created a normal git repository, named "configuration repo". I renamed the master branch to "configuration". The initial commi

Re: [PATCH] hooks/update: Add a hooks.denyunsignedtags option

2015-09-22 Thread Julian Andres Klode
On Sat, Sep 12, 2015 at 12:37:33PM +0200, Julian Andres Klode wrote: > Introduce an option to deny unsigned tags from entering > a repository. This is useful in teams where members forget > to sign their release tags. > > It does not actually check whether the signature is actually > complete or v

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Stefan Beller
On Tue, Sep 22, 2015 at 11:21 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Tue, Sep 22, 2015 at 8:58 AM, Junio C Hamano wrote: >>> Eric Sunshine writes: >>> > while (1) { > nr = read(fd, buf, len); > - if ((nr < 0) && (errno == EAGA

Re: Specifying N revisions after the initial commit

2015-09-22 Thread Konstantin Khomoutov
On Tue, 22 Sep 2015 14:32:19 -0400 Josh Boyer wrote: > Please CC me as I'm not subscribed. > > I was hoping someone could help me with the revision shorthand to get > the commit sha of a commit N commits after the initial commit. What happens if right after the initial commit, there have been f

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Torsten Bögershausen
On 22.09.15 08:23, Jacob Keller wrote: > On Mon, Sep 21, 2015 at 9:55 PM, Torsten Bögershausen wrote: >> But in any case I suggest to xread() as it is, and not to change the >> functionality >> behind the back of the users. >> >> > > I don't think this patch actually changes behavior as it stand

Re: [PATCH 1/2] notes: don't expand qualified refs in expand_notes_ref

2015-09-22 Thread Junio C Hamano
Jacob Keller writes: > The other issue here is that expand_notes_ref is called on the --ref > argument waaay before the current code even decides if the operation > is "read" or "write". Thus we'd have to break this out and handle > things very differently. I think you hit the right nail here.

Specifying N revisions after the initial commit

2015-09-22 Thread Josh Boyer
Hi All, Please CC me as I'm not subscribed. I was hoping someone could help me with the revision shorthand to get the commit sha of a commit N commits after the initial commit. Thus far I've figured out that to get the initial commit in a repository, you can use: git rev-list --max-parents=0 HE

Re: [PATCHv3 06/13] run-command: add an asynchronous parallel child processor

2015-09-22 Thread Stefan Beller
On Mon, Sep 21, 2015 at 6:08 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> +void default_start_failure(void *data, >> +struct child_process *cp, >> +struct strbuf *err) >> +{ >> + int i; >> + struct strbuf sb = STRBUF_INIT; >> + >>

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Sep 22, 2015 at 8:58 AM, Junio C Hamano wrote: >> Eric Sunshine writes: >> while (1) { nr = read(fd, buf, len); - if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) - continue;

Re: [PATCH v8 3/4] worktree: add functions to get worktree details

2015-09-22 Thread Junio C Hamano
Michael Rappazzo writes: > +/** > + * get the main worktree > + */ > +static struct worktree *get_main_worktree() static struct worktree *get_main_worktree(void) > +{ > + struct worktree *worktree = NULL; > struct strbuf path = STRBUF_INIT; > + struct strbuf worktree_path = STRBUF

Re: [PATCH 1/2] notes: don't expand qualified refs in expand_notes_ref

2015-09-22 Thread Jacob Keller
On Tue, Sep 22, 2015 at 7:17 AM, Junio C Hamano wrote: > Calls expand_notes_ref() made on a command line argument that > specifies the source (which I think is similar to what the other > recent topic calls "read-only") should be made to calls to a more > lenient version (and you can start with ge

Re: [PATCH v8 2/4] worktree: refactor find_linked_symref function

2015-09-22 Thread Junio C Hamano
Michael Rappazzo writes: > Refactoring will help transition this code to provide additional useful > worktree functions. > > Signed-off-by: Michael Rappazzo > --- > worktree.c | 86 > ++ > 1 file changed, 64 insertions(+), 22 deletion

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Stefan Beller
On Tue, Sep 22, 2015 at 8:58 AM, Junio C Hamano wrote: > Eric Sunshine writes: > >>> while (1) { >>> nr = read(fd, buf, len); >>> - if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) >>> - continue; >>> + if (nr < 0) { >>

Re: [PATCH v8 1/4] worktree: add top-level worktree.c

2015-09-22 Thread Junio C Hamano
Michael Rappazzo writes: > worktree.c contains functions to work with and get information from > worktrees. This introduction moves functions related to worktrees > from branch.c into worktree.c > > Signed-off-by: Michael Rappazzo > --- > Makefile| 1 + > branch.c| 79 +---

Re: [PATCHv3 07/13] fetch_populated_submodules: use new parallel job processing

2015-09-22 Thread Junio C Hamano
Stefan Beller writes: > 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 > --- > builtin/fetch.c | 3 +- > submodule.c | 119 > +

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Junio C Hamano
Lars Schneider writes: > If it is no extra work for you, you can remove the quotes around > “db”. I can also create a new patch roll including the sed change > and the quote change if it is easier for you. Now you've tested the SQUASH??? for me, I can just squash that into your original without

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-22 Thread Junio C Hamano
Gabor Bernat writes: > On Mon, Sep 21, 2015 at 11:24 PM, Gábor Bernát > ... >> Agreed, :) did not abandoned this, just got caught up with many stuff. >> Thanks for the help, > > So do I need to do anything else with this? :) If you can fetch from me to see if the output from git log -p orig

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Junio C Hamano
Lars Schneider writes: > This works. OK, and thanks; as I don't do perforce, the squash was without any testing. > Do we need the “-e” option? In syntactic sense, no, but our codebase tends to prefer to have one, because it is easier to spot which ones are the instructions if you consistently

Re: git-svn: Why not use git-fast-import?

2015-09-22 Thread Jeff King
On Tue, Sep 22, 2015 at 02:12:59AM -0700, Victor Leschuk wrote: > I've been playing with git-svn for some time already and as it seems > to me there are two most important problems which make it hard to use > in production for large repositories. Very low speed and large memory > footprint of sync

Re: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-22 Thread Junio C Hamano
Eric Sunshine writes: >> while (1) { >> nr = read(fd, buf, len); >> - if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) >> - continue; >> + if (nr < 0) { >> + if (errno == EINTR) >> +

Re: [PATCHv3 03/13] xread_nonblock: add functionality to read from fds nonblockingly

2015-09-22 Thread Junio C Hamano
Jacob Keller writes: > On Mon, Sep 21, 2015 at 3:39 PM, Stefan Beller wrote: > > Maybe change the title to "without blocking" instead of "nonblockingly"? Both suggestions make sense ;-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-22 Thread Gabor Bernat
On Mon, Sep 21, 2015 at 11:24 PM, Gábor Bernát wrote: > On Mon, Sep 21, 2015 at 11:22 PM, Eric Sunshine > wrote: >> >> On Mon, Sep 21, 2015 at 3:52 PM, Junio C Hamano wrote: >> > Eric Sunshine writes: >> >> On Tue, Sep 8, 2015 at 1:32 PM, Junio C Hamano >> >> wrote: >> >>> Eric Sunshine write

Re: [PATCHv3 09/13] submodule config: keep update strategy around

2015-09-22 Thread Stefan Beller
On Mon, Sep 21, 2015 at 5:56 PM, Eric Sunshine wrote: > On Mon, Sep 21, 2015 at 6:39 PM, Stefan Beller wrote: >> We need the submodule update strategies in a later patch. >> >> Signed-off-by: Stefan Beller >> --- >> diff --git a/submodule-config.c b/submodule-config.c >> @@ -326,6 +327,21 @@ sta

Re: [PATCH 1/2] notes: don't expand qualified refs in expand_notes_ref

2015-09-22 Thread Jacob Keller
On Tue, Sep 22, 2015 at 7:17 AM, Junio C Hamano wrote: > The current code before your patch limits the allowed pair of notes > trees by insisting that both appear as the tips of refs somewhere in > refs/notes/*. For allowing to merge from outside refs/notes/, you > need to loosen the location the

Re: [PATCH 1/2] notes: don't expand qualified refs in expand_notes_ref

2015-09-22 Thread Junio C Hamano
Jacob Keller writes: > I never got any better suggestion on how to allow the behavior > desired, which is to enable merging from a non-notes location, in > order to provide a standard location for remote notes, ie: > refs/remote-notes// Step back a bit and think again. I think you are blinded b

Re: [PATCH] git-svn: make batch mode optional for git-cat-file

2015-09-22 Thread Junio C Hamano
Victor Leschuk writes: > We already do have some of these: 'no-metadata', 'no-checkout', > no-auth-cache'. So I was just following the existing convention. Do > you think we need to change it and stick with > --catch-file-batch=1/--cat-file-batch=0 ? Inventing a new --cat-file-batch=[0|1] is not

RE: [PATCH] git-svn: make batch mode optional for git-cat-file

2015-09-22 Thread Victor Leschuk
As for your remark regarding the option naming: > An option whose name begins with no- looks somewhat strange. You can even say --no-no-cat-file-batch from the command line, I suspect. We already do have some of these: 'no-metadata', 'no-checkout', 'no-auth-cache'. So I was just following the

Re: Small mistakes in translation

2015-09-22 Thread Przemek Skrzyniarz
Thanks Ray, Ray Chen gmail.com> writes: > > On Tue, 22 Sep 2015, Przemysław Skrzyniarz wrote: > > The issues you found should better be reported to the progit community > on GitHub: https://github.com/progit/progit Next message, it means fourth I will send correctly group (of course and I'll

Re: Small mistakes in translation

2015-09-22 Thread Przemek Skrzyniarz
I'm found one more mistake on page => https://git-scm.com/book/pl/v1/Rozproszony-Git-Rozproszone-przep%C5%82ywy-pracy < In third line, before next to last line (Is: tryby => Should be: trybu) in fourth part of text entitle "Przepływ pracy z dyktatorem i porucznikami"(place in line - cit.: "... go d

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Lars Schneider
On 22 Sep 2015, at 01:54, Eric Sunshine wrote: > On Mon, Sep 21, 2015 at 7:03 PM, Lars Schneider > wrote: >> On 21 Sep 2015, at 20:09, Junio C Hamano wrote: >>> larsxschnei...@gmail.com writes: +test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' '

Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-22 Thread Lars Schneider
On 22 Sep 2015, at 03:10, Junio C Hamano wrote: > Eric Sunshine writes: > >> Yes, it's because $d is a variable reference, even within double >> quotes. > > s/even/especially/ ;-) > > Here is what I queued as SQUASH??? > > diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh > b/t/t9825

Re: Small mistakes in translation

2015-09-22 Thread Ray Chen
On Tue, 22 Sep 2015, Przemysław Skrzyniarz wrote: > Hi, > > On page => > https://git-scm.com/book/pl/v1/Rozproszony-Git-Rozproszone-przep%C5%82ywy-pracy > < I found typographical error in first line (Is: powala => Should be: > pozwala) in third part of text entitle "Przepływ pracy z osobą integru

git-svn: Why not use git-fast-import?

2015-09-22 Thread Victor Leschuk
Hello all, I've been playing with git-svn for some time already and as it seems to me there are two most important problems which make it hard to use in production for large repositories. Very low speed and large memory footprint of synchronization with SVN repos (I am talking about clone and

Small mistakes in translation

2015-09-22 Thread Przemysław Skrzyniarz
Hi, On page => https://git-scm.com/book/pl/v1/Rozproszony-Git-Rozproszone-przep%C5%82ywy-pracy < I found typographical error in first line (Is: powala => Should be: pozwala) in third part of text entitle "Przepływ pracy z osobą integrującą zmiany". And next line, it means third line at the bottom