Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-21 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 12:30 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> --- a/t/t3203-branch-output.sh >> +++ b/t/t3203-branch-output.sh >> @@ -145,8 +145,8 @@ EOF >> >> test_expect_success 'git branch `--sort` option' ' >>

допоможіть нашому сайту http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

2015-09-21 Thread admin
Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли

Re: [BUG?] HEAD detached at HEAD

2015-09-21 Thread Michael J Gruber
... in addition to my previous reply, looking at more context: >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1319,6 +1319,13 @@ static int grab_1st_switch(unsigned char *osha1, >> unsigned char *nsha1, >> hashcpy(cb->nsha1, nsha1); >> for (end = target; *end && *end != '\n';

Re: [BUG?] HEAD detached at HEAD

2015-09-21 Thread Matthieu Moy
Michael J Gruber writes: > ... in addition to my previous reply, looking at more context: > >>> --- a/wt-status.c >>> +++ b/wt-status.c >>> @@ -1319,6 +1319,13 @@ static int grab_1st_switch(unsigned char *osha1, >>> unsigned char *nsha1, >>> hashcpy(cb->nsha1,

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

2015-09-21 Thread Luke Diamand
On 20/09/15 23:29, Eric Sunshine wrote: On Sun, Sep 20, 2015 at 5:34 PM, Lars Schneider wrote: What is the preferred way by the Git community? Combine patch and test in one commit or a patch commit followed by a test commit? I would prefer to have everything in one

Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-21 Thread Matthieu Moy
Karthik Nayak writes: > On Mon, Sep 21, 2015 at 12:30 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> --- a/t/t3203-branch-output.sh >>> +++ b/t/t3203-branch-output.sh >>> @@ -145,8 +145,8 @@ EOF >>> >>>

Personal Email Directed To You.

2015-09-21 Thread wang_guiya13
I am Wang Guiya From Hong Kong. I have an important message for you(Business from My Bank) which is goin to benefit you and I a lot, but I want to be sure if you still use this email address before I pass the message across to you, I will be glad to read from you Now.Regards. -- To

git-p4: nicodeDecodeError in ./t9822-git-p4-path-encoding.sh

2015-09-21 Thread Luke Diamand
Lars, When I run t9822-git-p4-path-encoding.sh, the last test fails (it's supposed to pass) with the following backtrace. This is with 'next' at 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6. Any ideas as to what I'm doing wrong? Thanks, Luke Reinitialized existing Git repository in

Re: [BUG?] HEAD detached at HEAD

2015-09-21 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 18.09.2015 21:09: > Stefan Beller writes: > >> On Fri, Sep 18, 2015 at 10:23 AM, Matthieu Moy >> wrote: >>> Jacob Keller writes: >>> On Fri, Sep 18, 2015 at 9:59 AM, Matthieu Moy

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

2015-09-21 Thread Luke Diamand
On 20/09/15 17:22, larsxschnei...@gmail.com wrote: From: Lars Schneider When I run this, I get errors reported on the sed usage: t9824-git-p4-handle-utf16-without-bom.sh:25: error: sed -i is not portable: sed -i.bak "$ d" depot/file1,v &&

Re: git-p4: nicodeDecodeError in ./t9822-git-p4-path-encoding.sh

2015-09-21 Thread Luke Diamand
On 21/09/15 08:01, Luke Diamand wrote: Lars, When I run t9822-git-p4-path-encoding.sh, the last test fails (it's supposed to pass) with the following backtrace. This is with 'next' at 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6. Any ideas as to what I'm doing wrong? I think this is probably

Re: git-p4: nicodeDecodeError in ./t9822-git-p4-path-encoding.sh

2015-09-21 Thread Lars Schneider
On 21 Sep 2015, at 09:52, Luke Diamand wrote: > On 21/09/15 08:01, Luke Diamand wrote: >> Lars, >> >> When I run t9822-git-p4-path-encoding.sh, the last test fails (it's >> supposed to pass) with the following backtrace. >> >> This is with 'next' at

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

2015-09-21 Thread Stefan Beller
We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 16 submodule-config.h | 1 + 2 files changed, 17 insertions(+) diff --git a/submodule-config.c b/submodule-config.c index 393de53..0298a60

[PATCHv3 01/13] Sending "Fetching submodule " output to stderr

2015-09-21 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

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

2015-09-21 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

Re: [PATCH v2] format-patch: introduce format.outputDirectory configuration

2015-09-21 Thread Junio C Hamano
Eric Sunshine writes: > On Fri, Jun 19, 2015 at 2:28 PM, Alexander Kuleshov > wrote: >> We can pass -o/--output-directory to the format-patch command to >> store patches not in the working directory. This patch introduces >>

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

2015-09-21 Thread larsxschneider
From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as Git LFS [1], Git Fat [2], Git Media [3], git-annex [4] try to address this problem. Add

[PATCH v7 5/7] git-p4: check free space during streaming

2015-09-21 Thread larsxschneider
From: Lars Schneider git-p4 will just halt if there is not enough disk space while streaming content from P4 to Git. Add a check to ensure at least 4 times (arbitrarily chosen) the size of a streamed file is available. Signed-off-by: Lars Schneider

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

2015-09-21 Thread Eric Sunshine
On Mon, Sep 21, 2015 at 6:39 PM, Stefan Beller wrote: > From the man page: > [...] > So if we get an EAGAIN or EWOULDBLOCK error the fd must be nonblocking. s/So/&,/ s/error/&,/ > As the intend of xread is to read as much as possible either until the s/intend/intent/ > fd

Re: [PATCH v2] format-patch: introduce format.outputDirectory configuration

2015-09-21 Thread Eric Sunshine
On Mon, Sep 21, 2015 at 6:41 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> On Fri, Jun 19, 2015 at 2:28 PM, Alexander Kuleshov >> wrote: >>> We can pass -o/--output-directory to the format-patch command to >>> store

Re: email sender plugin in stash

2015-09-21 Thread Andrew Ardill
Hi Ankit, On 22 September 2015 at 15:35, Ankit Jain wrote: > HI > > I need to modify the notifyemail.vm plugin to show only those changes in the > email which i committed as a part of pull request. I do not want to see all > the > commits which happen again and again during

[PATCH v7 7/7] git-p4: add Git LFS backend for large file system

2015-09-21 Thread larsxschneider
From: Lars Schneider Add example implementation including test cases for the large file system using Git LFS. Pushing files to the Git LFS server is not tested. Signed-off-by: Lars Schneider --- git-p4.py | 72

Re: [PATCH v2 2/5] enter_repo: avoid duplicating logic, use is_git_directory() instead

2015-09-21 Thread Junio C Hamano
Duy Nguyen writes: > I know. I sent the re-roll before receiving this. I think I still > haven't mentioned the impact on remote case. Another update coming, > maybe next weekend. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH v7 4/7] git-p4: add file streaming progress in verbose mode

2015-09-21 Thread larsxschneider
From: Lars Schneider If a file is streamed from P4 to Git then the verbose mode prints continuously the progress as percentage like this: //depot/file.bin 20% (10 MB) Upon completion the progress is overwritten with depot source, local file and size like this:

[PATCH v7 2/7] git-p4: add gitConfigInt reader

2015-09-21 Thread larsxschneider
From: Lars Schneider Add a git config reader for integer variables. Please note that the git config implementation automatically supports k, m, and g suffixes. Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11

Re: [PATCHv3 01/13] Sending "Fetching submodule " output to stderr

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > Subject: Re: [PATCHv3 01/13] Sending "Fetching submodule " output to > stderr Subject: submodule: send "" to standard error or something? > if (is_directory(git_dir)) { > if (!quiet) > -

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

2015-09-21 Thread Victor Leschuk
Signed-off-by: Victor Leschuk --- git-svn.perl | 1 + perl/Git.pm | 41 - 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index 36f7240..b793c26 100755 --- a/git-svn.perl +++

Re: [PATCH v5 0/8] port the filtering part of branch.c to use ref-filter APIs

2015-09-21 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 11:53 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Mon, Sep 21, 2015 at 12:30 AM, Matthieu Moy >> wrote: >>> Karthik Nayak writes: >>> ---

Re: [PATCH v5 5/8] branch: drop non-commit error reporting

2015-09-21 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 12:46 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> Remove the error reporting variable to make the code easier to port >> over to using ref-filter APIs. This variable > > (it's not just a variable, it's also a

Re: [PATCH v5 7/8] branch.c: use 'ref-filter' APIs

2015-09-21 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 12:54 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> --- a/Documentation/git-branch.txt >> +++ b/Documentation/git-branch.txt >> @@ -231,6 +231,13 @@ start-point is either a local or remote-tracking branch. >>

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

2015-09-21 Thread Lars Schneider
On 21 Sep 2015, at 20:09, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> A P4 repository can get into a state where it contains a file with >> type UTF-16 that does not contain a valid UTF-16 BOM. If

Re: [PATCHv3 04/13] strbuf: add strbuf_read_once to read without blocking

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > The new call will read a fd into a strbuf once. The underlying call "read from a fd" > xread_nonblock is meant to execute non blockingly if the fd is set to > O_NONBLOCK. The latter sentence adds more questions than it answers. If the file

Re: [PATCHv3 05/13] run-command: factor out return value computation

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > We will need computing the return value in a later patch without the > wait. > > Signed-off-by: Stefan Beller > --- > run-command.c | 54 -- > 1 file changed, 32 insertions(+),

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

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > This wrapper just restarts on EINTR, but not on EAGAIN like xread > does. This gives less guarantees on the actual reading rather than > on returning fast. > > Signed-off-by: Stefan Beller > --- > git-compat-util.h | 1 + >

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

2015-09-21 Thread Eric Sunshine
On Wed, Sep 16, 2015 at 4:49 PM, Mike Rappazzo wrote: > On Wed, Sep 16, 2015 at 4:32 PM, Eric Sunshine > wrote: >> On Mon, Sep 14, 2015 at 8:20 AM, Mike Rappazzo wrote: >>> On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine

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

2015-09-21 Thread Eric Sunshine
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: [PATCHv3 02/13] xread: poll on non blocking fds

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > So if we get an EAGAIN or EWOULDBLOCK error the fd must be nonblocking. > As the intend of xread is to read as much as possible either until the > fd is EOF or an actual error occurs, we can ease the feeder of the fd > by not spinning the whole time,

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

2015-09-21 Thread Eric Sunshine
On Wed, Sep 16, 2015 at 5:36 PM, Mike Rappazzo wrote: > On Wed, Sep 16, 2015 at 5:09 PM, Eric Sunshine > wrote: >> On Mon, Sep 14, 2015 at 1:44 PM, Mike Rappazzo wrote: >>> On Sat, Sep 12, 2015 at 11:19 PM, Eric Sunshine

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

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > +void default_start_failure(void *data, > +struct child_process *cp, > +struct strbuf *err) > +{ > + int i; > + struct strbuf sb = STRBUF_INIT; > + > + for (i = 0; cp->argv[i]; i++) > +

[PATCHv3 12/13] git submodule update: cmd_update_fetch

2015-09-21 Thread Stefan Beller
Signed-off-by: Stefan Beller --- git-submodule.sh | 164 --- 1 file changed, 84 insertions(+), 80 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 7f11158..a1bc8d5 100755 --- a/git-submodule.sh +++

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

2015-09-21 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 --- builtin/fetch.c | 3 +- submodule.c | 119

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

2015-09-21 Thread larsxschneider
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 fix in my development

[PATCHv3 13/13] Rewrite submodule update in C

2015-09-21 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 | 247 git-submodule.sh

[PATCHv3 08/13] submodules: allow parallel fetching, add tests and documentation

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

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

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

[PATCHv3 10/13] git submodule update: cmd_update_recursive

2015-09-21 Thread Stefan Beller
split the recursion part out to its own function Signed-off-by: Stefan Beller --- git-submodule.sh | 47 ++- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 8964b1d..71385cb

[PATCHv3 05/13] run-command: factor out return value computation

2015-09-21 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 | 54 -- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/run-command.c

[PATCHv3 11/13] git submodule update: cmd_update_clone

2015-09-21 Thread Stefan Beller
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 index 71385cb..7f11158 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -607,6

[PATCH v7 3/7] git-p4: return an empty list if a list config has no values

2015-09-21 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index 2715895..e7d1b3f 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def

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

2015-09-21 Thread Stefan Beller
This wrapper just restarts on EINTR, but not on EAGAIN like xread does. This gives less guarantees on the actual reading rather than on returning fast. Signed-off-by: Stefan Beller --- git-compat-util.h | 1 + wrapper.c | 22 ++ 2 files changed,

[PATCHv3 00/13] fetch submodules in parallel and a preview on parallel "submodule update"

2015-09-21 Thread Stefan Beller
This build on top of origin/sb/submodule-helper Patches 1-8 are parallelising fetching submodules. Thanks Eric, Jeff and Junio for the discussion and review! Based on your feedback: Patch 2 is optional and may be spun out as its own mini series. Instead of spinning we can poll until data are

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

2015-09-21 Thread larsxschneider
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 the implementation

[PATCHv3 04/13] strbuf: add strbuf_read_once to read without blocking

2015-09-21 Thread Stefan Beller
The new call will read a fd into a strbuf once. The underlying call xread_nonblock is meant to execute non blockingly if the fd is set to O_NONBLOCK. Signed-off-by: Stefan Beller --- strbuf.c | 11 +++ strbuf.h | 6 ++ 2 files changed, 17 insertions(+) diff

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

2015-09-21 Thread Junio C Hamano
Stefan Beller writes: > This wrapper just restarts on EINTR, but not on EAGAIN like xread > does. This gives less guarantees on the actual reading rather than > on returning fast. The last sentence is a bit hard to parse, by the way. It lets caller make some progress

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

2015-09-21 Thread Eric Sunshine
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 @@ static int

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

2015-09-21 Thread Junio C Hamano
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-git-p4-handle-utf16-without-bom.sh index

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

2015-09-21 Thread Junio C Hamano
Eric Sunshine writes: > Making the last entry a NULL means get_worktrees() would have to > return an array of pointers rather than an array of structures, which > is more syntactically noisy, and complex since it's harder to reason > about pointer-to-pointer. In my mind,

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

2015-09-21 Thread Victor Leschuk
Hello Junio, thanks for your review. First of all I'd like to apologize for sending the patch without description. Actually I was in a hurry and sent it by accident: I planned to edit the mail before sending... Here is the detailed description: Last week we had a quick discussion in this

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

2015-09-21 Thread Torsten Bögershausen
On 09/22/2015 01:55 AM, Junio C Hamano wrote: Stefan Beller writes: So if we get an EAGAIN or EWOULDBLOCK error the fd must be nonblocking. As the intend of xread is to read as much as possible either until the fd is EOF or an actual error occurs, we can ease the feeder of

email sender plugin in stash

2015-09-21 Thread Ankit Jain
HI I need to modify the notifyemail.vm plugin to show only those changes in the email which i committed as a part of pull request. I do not want to see all the commits which happen again and again during the review process. We actually squash all the commits and the reviewer always see the

Re: [PATCH 66/67] use strbuf_complete to conditionally append slash

2015-09-21 Thread Jeff King
On Sun, Sep 20, 2015 at 09:50:28PM -0400, Eric Sunshine wrote: > > diff --git a/builtin/clean.c b/builtin/clean.c > > index df53def..d7acb94 100644 > > --- a/builtin/clean.c > > +++ b/builtin/clean.c > > @@ -159,8 +159,7 @@ static int is_git_repository(struct strbuf *path) > > int

Business

2015-09-21 Thread Dami
Hello Dear, I guess this message will not appear to you surprisingly. I got your contact from an international directory and I decided to secretly share a harmless deal with you provided you will maintain trust. I work as a banker and I have 5.5 million Euros ready to be transferred in your

Re: git rebase -i failing due to phantom index.lock

2015-09-21 Thread Giuseppe Bilotta
Hello, On Thu, Sep 17, 2015 at 2:57 PM, Duy Nguyen wrote: > On Thu, Sep 17, 2015 at 3:08 AM, Giuseppe Bilotta > wrote: > >> A somewhat problematic git bisect has allowed me to identify commit >> 03b86647722f11ccc321cd7279aa49b811d17cc2 as the first

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

2015-09-21 Thread Junio C Hamano
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 allowed to "git push" into it should be able to write there. It is a different matter that "git" program itself may

Re: [PATCH 54/67] color: add overflow checks for parsing colors

2015-09-21 Thread Junio C Hamano
Jeff King writes: > On Fri, Sep 18, 2015 at 02:54:11PM -0400, Eric Sunshine wrote: > >> > @@ -224,12 +227,18 @@ int color_parse_mem(const char *value, int >> > value_len, char *dst) >> > goto bad; >> > } >> > >> > +#define OUT(x) do { \ >> > +

Re: [BUG?] HEAD detached at HEAD

2015-09-21 Thread Junio C Hamano
Matthieu Moy writes: > I investigated a bit more. The root of the problem is "git checkout > --detach" and the reflog. Here's a reproduction script: > ... > If one replaces "git checkout --detach" with "git checkout HEAD^0", then > the output is the one I expected:

Re: [PATCH v3 0/2] gitignore, re-inclusion fix

2015-09-21 Thread Junio C Hamano
This round is very clearly explained and I like it very much ;-) Thanks for fixing this. -- 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 v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Junio C Hamano
Lars Schneider writes: > What OS/sed version are you using? You should go with POSIX.1 http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

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

2015-09-21 Thread Junio C Hamano
Lars Schneider writes: > On 20 Sep 2015, at 23:16, Eric Sunshine wrote: > >> On Sun, Sep 20, 2015 at 12:22 PM, wrote: >>> A P4 repository can get into a state where it contains a file with >>> type UTF-16 that does

Re: [PATCH] send-email: fix uninitialized var warning for $smtp_auth

2015-09-21 Thread Junio C Hamano
Brian Norris writes: > On the latest version of git-send-email, I see this error just before > running SMTP auth (I didn't provide any --smtp-auth= parameter): > > Use of uninitialized value $smtp_auth in pattern match (m//) at >

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

2015-09-21 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > A P4 repository can get into a state where it contains a file with > type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 > attempts to retrieve the file then the process crashes with a >

Re: [PATCH/RFC] Add test_repo_expect_success for running tests in a new repository

2015-09-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This could be convenient when tests are independent from the rest in the > same file. Normally we would do this > > test_expect_success '...' ' > git init foo && > ( > cd foo && >

Re: [Alt. PATCH v5] gc: save log from daemonized gc --auto and print it next time

2015-09-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The lock-based version has an advantage that the following gc runs > will never see partial gc.log. But it requires some more hook at > atexit() and maybe signal handler. > > This version avoids that, and gc.log can be kept even if gc is >

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

2015-09-21 Thread Junio C Hamano
Remi Pommarel writes: > On Thu, Sep 17, 2015 at 03:08:25PM -0700, Junio C Hamano wrote: >> That is, for most people, linking with -lcrypto was sufficient, but >> some people needed to grab things from -lssl when they need to do >> so, because things in -lcrypto referred to

Re: [PATCH 56/67] avoid sprintf and strcpy with flex arrays

2015-09-21 Thread Jeff King
On Mon, Sep 21, 2015 at 01:11:09PM -0400, Eric Sunshine wrote: > >> > - p = xcalloc(1, sizeof(*p) + strlen(tmp_file) + 2); > >> > - strcpy(p->pack_name, tmp_file); > >> > + namelen = strlen(tmp_file) + 2; > >> > >> You mentioned this specially in the commit message, but from a

Re: [PATCH v5] gc: save log from daemonized gc --auto and print it next time

2015-09-21 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > While commit 9f673f9 (gc: config option for running --auto in > background - 2014-02-08) helps reduce some complaints about 'gc > --auto' hogging the terminal, it creates another set of problems. > > The latest in this set is, as the result of

Re: [PATCH 56/67] avoid sprintf and strcpy with flex arrays

2015-09-21 Thread Eric Sunshine
On Mon, Sep 21, 2015 at 11:15 AM, Jeff King wrote: > On Sun, Sep 20, 2015 at 06:48:32PM -0400, Eric Sunshine wrote: >> > diff --git a/archive.c b/archive.c >> > index 01b0899..4ac86c8 100644 >> > --- a/archive.c >> > +++ b/archive.c >> > @@ -171,13 +171,14 @@ static void

Re: default remote branch

2015-09-21 Thread Junio C Hamano
Thibault Kruse writes: > Also, I tried finding out whether I can use the > .git/refs/remotes//HEAD to check the default branch without > accessing the remote. However, I find this file is not updated with a > git fetch, nor created when missing. That is more or less

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

2015-09-21 Thread Joakim Tjernlund
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 allowed to "git push" into it should be able to

Re: [PATCH 56/67] avoid sprintf and strcpy with flex arrays

2015-09-21 Thread Jeff King
On Sun, Sep 20, 2015 at 06:48:32PM -0400, Eric Sunshine wrote: > > diff --git a/archive.c b/archive.c > > index 01b0899..4ac86c8 100644 > > --- a/archive.c > > +++ b/archive.c > > @@ -171,13 +171,14 @@ static void queue_directory(const unsigned char *sha1, > > unsigned mode, int

[PATCH v3 2/2] dir.c: don't exclude whole dir prematurely if neg pattern may match

2015-09-21 Thread Nguyễn Thái Ngọc Duy
If there is a pattern "!foo/bar", this patch makes it not exclude "foo" right away. This gives us a chance to examine "foo" and re-include "foo/bar". In order for it to detect that the directory under examination should not be excluded right away, in other words it is a parent directory of a

[PATCH v3 0/2] gitignore, re-inclusion fix

2015-09-21 Thread Nguyễn Thái Ngọc Duy
Changes since v2 -- 8< -- diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 889a72a..79a1948 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -82,9 +82,12 @@ PATTERN FORMAT - An optional prefix "`!`" which negates the pattern; any

[PATCH v3 1/2] dir.c: make last_exclude_matching_from_list() run til the end

2015-09-21 Thread Nguyễn Thái Ngọc Duy
The next patch adds some post processing to the result value before it's returned to the caller. Keep all branches reach the end of the function, so we can do it all in one place. Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c | 15 ++- 1 file changed, 10

[PATCH v4 0/2] git-p4: handle "Translation of file content failed"

2015-09-21 Thread larsxschneider
From: Lars Schneider diff to v3: * replace non portable "sed -i" call in test case (thanks Luke and Torsten!) * use "test_expect_failure" in the first commit that adds the test case, flip it to "test_expect_success" in subsequent commit (thanks Eric and Luke!) * rename

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

2015-09-21 Thread larsxschneider
From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. More info

[PATCH v4 2/2] git-p4: handle "Translation of file content failed"

2015-09-21 Thread larsxschneider
From: Lars Schneider A P4 repository can get into a state where it contains a file with type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4 attempts to retrieve the file then the process crashes with a "Translation of file content failed" error. More info

Re: [PATCH v3] git-p4: use replacement character for non UTF-8 characters in paths

2015-09-21 Thread Junio C Hamano
Luke Diamand writes: > On 21/09/15 09:49, larsxschnei...@gmail.com wrote: >> From: Lars Schneider >> >> I broke a test in "[PATCH v2] git-p4: improve path encoding verbose >> output" on the next branch. >> This patch on top of next (3dd15c0) fixes the

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

2015-09-21 Thread Junio C Hamano
Luke Diamand writes: > On 20/09/15 21:26, larsxschnei...@gmail.com wrote: >> From: Lars Schneider >> >> diff to v5: >> * remove superfluous flush call (thanks Luke!) >> * keep &&-chain intact in test cases (thanks Luke, Junio and Eric!) >> * add mock

What's cooking in git.git (Sep 2015, #05; Mon, 21)

2015-09-21 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of master gained l10n updates and a regression fix to "git send-email" and is now at v2.6.0-rc3. I am hoping that the remainder of the

Re: [PATCH v3] git-p4: use replacement character for non UTF-8 characters in paths

2015-09-21 Thread Luke Diamand
On 21/09/15 09:49, larsxschnei...@gmail.com wrote: From: Lars Schneider I broke a test in "[PATCH v2] git-p4: improve path encoding verbose output" on the next branch. This patch on top of next (3dd15c0) fixes the issue. Thanks to Luke for finding the issue! Looks

Re: [PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)'

2015-09-21 Thread Junio C Hamano
Josef Kufner writes: > Pass graph width to pretty formatting, so N in '%>|(N)' includes columns > consumed by graph rendered when --graph option is in use. > > Example: > git log --all --graph --pretty='format: [%>|(20)%h] %ar%d' > > All commit hashes should be aligned at

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

2015-09-21 Thread Luke Diamand
On 20/09/15 21:26, larsxschnei...@gmail.com wrote: From: Lars Schneider diff to v5: * remove superfluous flush call (thanks Luke!) * keep &&-chain intact in test cases (thanks Luke, Junio and Eric!) * add mock LFS test case for deleting files (thanks Luke!) * add mock

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

2015-09-21 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Sep 8, 2015 at 1:32 PM, Junio C Hamano wrote: >> Eric Sunshine writes: >>> On Mon, Sep 7, 2015 at 9:52 AM, Gábor Bernát wrote: >>>... # Rewrite the commits

Re: [PATCH v5 5/8] branch: drop non-commit error reporting

2015-09-21 Thread Karthik Nayak
On Mon, Sep 21, 2015 at 3:50 PM, Karthik Nayak wrote: > On Mon, Sep 21, 2015 at 12:46 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> Remove the error reporting variable to make the code easier to port >>>

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

2015-09-21 Thread Junio C Hamano
Victor Leschuk writes: > Signed-off-by: Victor Leschuk > --- Before the S-o-b line is a good place to explain why this is a good change to have. Please use it. > git-svn.perl | 1 + > perl/Git.pm | 41 -

Re: [PATCH/RFC] Add test_repo_expect_success for running tests in a new repository

2015-09-21 Thread Jeff King
On Sun, Sep 20, 2015 at 08:25:02AM +0700, Nguyễn Thái Ngọc Duy wrote: > This could be convenient when tests are independent from the rest in the > same file. Normally we would do this > > test_expect_success '...' ' > git init foo && > ( > cd foo && >

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

2015-09-21 Thread Eric Sunshine
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 writes: On Mon, Sep 7, 2015 at 9:52 AM, Gábor

[ANNOUNCE] Git v2.6.0-rc3

2015-09-21 Thread Junio C Hamano
A release candidate Git v2.6.0-rc3 is now available for testing at the usual places. It is comprised of 478 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/testing/ The following

[PATCH v3] git-p4: use replacement character for non UTF-8 characters in paths

2015-09-21 Thread larsxschneider
From: Lars Schneider I broke a test in "[PATCH v2] git-p4: improve path encoding verbose output" on the next branch. This patch on top of next (3dd15c0) fixes the issue. Thanks to Luke for finding the issue! Cheers, Lars Lars Schneider (1): git-p4: use replacement

[PATCH v3] git-p4: use replacement character for non UTF-8 characters in paths

2015-09-21 Thread larsxschneider
From: Lars Schneider If non UTF-8 characters are detected in paths then replace them with � instead of throwing a UnicodeDecodeError exception. This restores the original (implicit) implementation that was broken in 00a9403. Signed-off-by: Lars Schneider

  1   2   >