Re: [PATCH v6 25/25] refs: break out ref conflict checks

Junio C Hamano writes: > Michael Haggerty writes: > >> Junio, if there are no more comments, would you mind >> >> s/verify_no_descendants/find_descendant_ref/ >> >> in the log message of this commit? And then, if you are also OK with the >> new

What's cooking in git.git (Nov 2015, #02; Fri, 6)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. I'll be offline for a few weeks, and Jeff King graciously agreed to help shepherd the project forward in the meantime as an interim maintainer.

[PATCH] receive-pack: avoid sending duplicate "have" lines

Alternates and refs outside the current namespace are advertised as "have" lines. To this end, the object identifiers of alternates are collected in an array and repeated hashes are omitted before transmission. In contrast, refs outside the used namespace are currently converted into "have" lines

[PATCH v2 1/3] git-p4: add failing test for submit from detached head

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand --- t/t9800-git-p4-basic.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index

[PATCH] wt-status: use strncmp() for length-limited string comparison

When a branch name is longer than four characters, memcmp() can read past the end of the string literal "HEAD". Use strncmp() instead, which stops at the end of a string. This fixes the following test failures with AddressSanitizer: t3203-branch-output.sh (Wstat: 256

[PATCH v2 3/3] git-p4: work with a detached head

When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit

[PATCH v2 2/3] git-p4: add option to system() to return subshell status

Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand --- git-p4.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[PATCH v2 0/2] git-p4: allow submission from detached head

This is a reroll of my earlier patch to teach git-p4 about detached heads. It uses Junio's suggestion of calling "git symbolic-ref" to determine if we're on a detached head, rather than parsing text strings. Luke Diamand (3): git-p4: add failing test for submit from detached head git-p4: add

Re: What's cooking in git.git (Nov 2015, #02; Fri, 6)

On Fri, Nov 6, 2015 at 5:41 PM, Junio C Hamano wrote: > I'll be offline for a few weeks, and Jeff King graciously agreed to > help shepherd the project forward in the meantime as an interim > maintainer. Please be gentle. Be gentle? To Jeff??? But he's an ass Just

Re: [PATCH] receive-pack: avoid sending duplicate "have" lines

Lukas Fleischer writes: > @@ -254,9 +255,9 @@ static void write_head_info(void) > struct sha1_array sa = SHA1_ARRAY_INIT; > > for_each_alternate_ref(collect_one_alternate_ref, ); > + for_each_ref(show_ref_cb, ); > sha1_array_for_each_unique(,

[PATCH] run-command: detect finished children by closed pipe rather than waitpid

Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross platform operation. (It's less code, too) Previously we did not close the read

Re: [PATCH] run-command: detect finished children by closed pipe rather than waitpid

On 07.11.15 00:48, Stefan Beller wrote: > > +enum child_state { > + FREE, > + WORKING, > + WAIT_CLEANUP, > +}; This kind of "generic names" feels are begging for name clash, some day, may be in the future. How about something like this: > + GIT_CP_FREE, > + GIT_CP_WORKING,

Re: [PATCH] In configure.ac, try -lpthread in $LIBS instead of $CFLAGS to make picky linkers happy

"Rainer M. Canavan" writes: > Subject: Re: [PATCH] In configure.ac, try -lpthread in $LIBS instead of > $CFLAGS to make picky linkers happy The patch looks good, but the subject should be improved. We normally try to stick to 50 characters (to let "git log --oneline" fit in a

Re: [PATCH v4 4/4] Add Travis CI support

On Fri, Nov 6, 2015 at 3:58 AM, wrote: > The tests are currently executed on "Ubuntu 12.04 LTS Server Edition > 64 bit" and on "OS X Mavericks" using gcc and clang. > > Perforce and Git-LFS are installed and therefore available for the > respective tests. > >

[PATCH v4 0/4] Add Travis CI support

From: Lars Schneider diff to v3: * Removed git-p4 OS X test fixes and submitted them in a separate roll as request by Junio [1]. * Fix brew formula typo. (thanks Eric) * Move "make configure && ./configure" from "install" to "before_script" phase. (thanks

Re: [PATCH v4 2/4] git-p4: add p4d timeout in tests

On Fri, Nov 6, 2015 at 3:58 AM, wrote: > In rare cases p4d seems to hang. This watchdog will kill the p4d > process after 300s in any case. That means each individual git p4 test > needs to finish before 300s or it will fail. > > Signed-off-by: Lars Schneider

Re: [PATCH v4 3/4] git-p4: retry kill/cleanup operations in tests with timeout

> On 06 Nov 2015, at 10:28, Eric Sunshine wrote: > > On Fri, Nov 6, 2015 at 3:58 AM, wrote: >> In rare cases kill/cleanup operations in tests fail. Retry these >> operations with a timeout to make the test less flaky. >> >> Signed-off-by:

[PATCH v4 1/4] add function test_must_fail_or_sigpipe and use it to fix flaky tests

From: Lars Schneider t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" is flaky in the following case: 1. remote upload-pack finds out "not our ref" 2. remote sends a response and closes the pipe 3. fetch-pack still tries to write commands to the remote

[PATCH v4 3/4] git-p4: retry kill/cleanup operations in tests with timeout

From: Lars Schneider In rare cases kill/cleanup operations in tests fail. Retry these operations with a timeout to make the test less flaky. Signed-off-by: Lars Schneider --- t/lib-git-p4.sh | 31 +++ 1 file

[PATCH v4 2/4] git-p4: add p4d timeout in tests

From: Lars Schneider In rare cases p4d seems to hang. This watchdog will kill the p4d process after 300s in any case. That means each individual git p4 test needs to finish before 300s or it will fail. Signed-off-by: Lars Schneider ---

[PATCH v4 4/4] Add Travis CI support

From: Lars Schneider The tests are currently executed on "Ubuntu 12.04 LTS Server Edition 64 bit" and on "OS X Mavericks" using gcc and clang. Perforce and Git-LFS are installed and therefore available for the respective tests. Signed-off-by: Lars Schneider

Re: [PATCH v4 3/4] git-p4: retry kill/cleanup operations in tests with timeout

On Fri, Nov 6, 2015 at 3:58 AM, wrote: > In rare cases kill/cleanup operations in tests fail. Retry these > operations with a timeout to make the test less flaky. > > Signed-off-by: Lars Schneider > --- > diff --git a/t/lib-git-p4.sh

Re: [PATCH v2] gitk: add -C commandline parameter to change path

On Thu, Nov 5, 2015 at 4:19 AM, Juha-Pekka Heikkila wrote: > This patch adds -C (change working directory) parameter to > gitk. With this parameter, instead of need to cd to directory > with .git folder, one can point the correct folder from > commandline. Thanks,

Re: [PATCH v2] gitk: add -C commandline parameter to change path

On 06.11.2015 11:48, Eric Sunshine wrote: On Thu, Nov 5, 2015 at 4:19 AM, Juha-Pekka Heikkila wrote: This patch adds -C (change working directory) parameter to gitk. With this parameter, instead of need to cd to directory with .git folder, one can point the

Re: A note from the maintainer

Hi Junio, Thanks for writing this note! It is very helpful. On Fri, Nov 6, 2015 at 7:14 AM, Junio C Hamano wrote: > The list archive is available at a few public sites: > > http://news.gmane.org/gmane.comp.version-control.git/ >

Re: [PATCH v6 25/25] refs: break out ref conflict checks

Michael Haggerty writes: > Junio, if there are no more comments, would you mind > > s/verify_no_descendants/find_descendant_ref/ > > in the log message of this commit? And then, if you are also OK with the > new subdirectory introduced in this patch series, David and I

Re: [PATCH v6 25/25] refs: break out ref conflict checks

On 11/05/2015 05:22 PM, David Turner wrote: > [...] But while looking at it, I > noticed that the commit message doesn't look quite right (my fault): > > On Thu, 2015-11-05 at 05:00 +0100, Michael Haggerty wrote: >> Create new function verify_no_descendants, to hold one of the ref >> conflict

Re: [PATCH v4 1/4] add function test_must_fail_or_sigpipe and use it to fix flaky tests

Junio C Hamano writes: > Adding the third variant in the way this patch does is making things > worse by inviting more mistakes. > > How about doing something like the attached to consolidate the > existing two into one, and then build this third one on top? Actually, I think

Re: Odd problems trying to build an orphaned branch

On Fri, Nov 06, 2015 at 10:32:56AM -0800, a...@clueserver.org wrote: > > Yes. There is no defined format for merge patches, so git-format-patch > > cannot show them. What you're trying to do won't work. > > This makes me worry about using git-format-patch. If it cannot handle > merge commits

Re: [PATCH] git-stash: Don't GPG sign when stashing changes

Cameron Currie writes: > This is helpful for folks with commit.gpgsign = true in their .gitconfig. > --- > git-stash.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) I have to wonder if the right fix is to change "git commit-tree" to ignore that

Re: [PATCH 1/2] run-command: Remove set_nonblocking

On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt wrote: > However, I think that the infrastructure can be simplified even further > to a level that we do not need additional emulation on Windows. > > First let me say that I find it very questionable that the callbacks > receive a

Re: [PATCH] Update japanese translation

On Tue, Nov 03, 2015 at 12:40:45PM -0800, Junio C Hamano wrote: > Could you redo this change against Paul Mackerras's tree, which is > our upstream "gitk" project, that is found here: > > git://git.kernel.org/pub/scm/gitk/gitk.git > > and Cc Paul Mackerras when you post

[PATCH] gitk: Update Japanese translation

From: Hiroshi Miura - Update untranslated terms in gitk in Japanese Signed-off-by: Hiroshi Miura --- gitk-git/po/ja.po | 119 -- 1 file changed, 53 insertions(+), 66 deletions(-) diff --git

Re: git blame performance

On 11/06/2015 02:37 PM, Jan Smets wrote: > I have recently migrated a fairly large project from CVS to Git. > One of the issues we're having is the blame/annotate performance. > [...] > cvs annotate of the same file (over the network) is ready in 0.8 seconds. > blame/annotate is a frequently used

Re: [PATCH v4 2/4] git-p4: add p4d timeout in tests

> On 06 Nov 2015, at 10:23, Eric Sunshine wrote: > > On Fri, Nov 6, 2015 at 3:58 AM, wrote: >> In rare cases p4d seems to hang. This watchdog will kill the p4d >> process after 300s in any case. That means each individual git p4 test >> needs

Re: [PATCH v4 4/4] Add Travis CI support

On Fri, Nov 6, 2015 at 2:11 PM, Lars Schneider wrote: > Per platform/compiler (Linux/clang) we run two configurations. One > normal configuration (see the lonely "-" right under "matrix:") and one > configuration with all sorts of things are disabled ("NO..."). > > You

Re: [PATCH v4 4/4] Add Travis CI support

On Fri, Nov 6, 2015 at 2:28 PM, Lars Schneider wrote: > Well, I partly agree. Right now the running time is ~20 min (that means less > than your 30min target!). After ~10min you even have all Linux results, Mac > takes a bit longer. Travis shows you 2h because that is

Re: A note from the maintainer

Thanks. I've known about the URL moving to marc.info for a long time, and I am kind of surprised that I had this stale one left un-updated for so long. Fixed. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v4 4/4] Add Travis CI support

> On 06 Nov 2015, at 14:57, Sebastian Schuberth wrote: > > On Fri, Nov 6, 2015 at 2:55 PM, Lars Schneider > wrote: > >>> I think running different configuration per branch makes sense, yes. >> >> If the list decides to accept this patch. Do

Re: [PATCH v4 4/4] Add Travis CI support

> On 06 Nov 2015, at 14:20, Sebastian Schuberth wrote: > > On Fri, Nov 6, 2015 at 2:11 PM, Lars Schneider > wrote: > >> Per platform/compiler (Linux/clang) we run two configurations. One >> normal configuration (see the lonely "-" right under

git blame performance

Hi I have recently migrated a fairly large project from CVS to Git. One of the issues we're having is the blame/annotate performance. The repository contains +650k commits total, of which ~300k are on master. (raw size = ~8GB) Running blame on one of the oldest files takes over 30 seconds.

Re: [PATCH v4 4/4] Add Travis CI support

> On 06 Nov 2015, at 14:36, Sebastian Schuberth wrote: > > On Fri, Nov 6, 2015 at 2:28 PM, Lars Schneider > wrote: > >> Well, I partly agree. Right now the running time is ~20 min (that means less >> than your 30min target!). After ~10min you

[PATCH] git-stash: Don't GPG sign when stashing changes

This is helpful for folks with commit.gpgsign = true in their .gitconfig. --- git-stash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index c7c65e2..fcf01b9 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -85,7 +85,7 @@ create_stash () {

Re: [PATCH v4 1/4] add function test_must_fail_or_sigpipe and use it to fix flaky tests

larsxschnei...@gmail.com writes: > From: Lars Schneider > > t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" is > flaky in the following case: > 1. remote upload-pack finds out "not our ref" > 2. remote sends a response and closes the pipe > 3.

Re: Odd problems trying to build an orphaned branch

> On Thu, Nov 05, 2015 at 01:16:54PM -0800, a...@clueserver.org wrote: > >> I created an orphan branch from 3.12-rc1. I then used git format-patch >> to >> generate patches from 3.12-rc1 to HEAD. (Over 7000 patches.) I use git >> am >> to apply them to the orphan branch. At patch 237 it fails to

Partnership,

Partnership, I would like to contact you personally for an important proposal that that could be of interest to you .I have something very important to discuss with you. Contact me for details by: Email: wilfredbe...@lawyer.com with your direct contacts. Best

Re: git blame performance

Michael Haggerty writes: > The reason that cvs annotate is so much faster than git blame is that > CVS stores revisions filewise, with all of the modifications to file > $FILE being stored in a single $FILE,v file. So in the worst case, CVS > only has to read this one file.

Re: [PATCH v4 3/4] git-p4: retry kill/cleanup operations in tests with timeout

> On 06 Nov 2015, at 10:28, Eric Sunshine wrote: > > On Fri, Nov 6, 2015 at 3:58 AM, wrote: >> In rare cases kill/cleanup operations in tests fail. Retry these >> operations with a timeout to make the test less flaky. >> >> Signed-off-by:

Re: [PATCH v4 4/4] Add Travis CI support

> On 06 Nov 2015, at 10:56, Eric Sunshine wrote: > > On Fri, Nov 6, 2015 at 3:58 AM, wrote: >> The tests are currently executed on "Ubuntu 12.04 LTS Server Edition >> 64 bit" and on "OS X Mavericks" using gcc and clang. >> >> Perforce and

Re: [PATCH v4 4/4] Add Travis CI support

On Fri, Nov 6, 2015 at 2:55 PM, Lars Schneider wrote: >> I think running different configuration per branch makes sense, yes. > > If the list decides to accept this patch. Do you think that would be a > necessary requirement for the first iteration? No. I think this

Re:git在不。(AD)

git 欢迎加入爱奇艺vip分享QQ群：5650047 每天发放好几波爱奇艺vip会员，看蜀山战纪，灵魂摆渡2等热门大片不要钱！限时开放！验证码511

Re: [PATCH 1/2] run-command: Remove set_nonblocking

Am 06.11.2015 um 20:00 schrieb Stefan Beller: On Thu, Nov 5, 2015 at 12:27 PM, Johannes Sixt wrote: Here is a prototype patch. Feel free to pick it up. It marks a process whose EOF we have found by setting .err to -1. It's probably better to extend the meaning of the in_use