Re: git status doesn't ignore GIT_DIR directory?

2015-05-22 Thread Mike Hommey
On Sat, May 23, 2015 at 09:22:56AM +0700, Duy Nguyen wrote: > On Fri, May 22, 2015 at 07:03:48PM -0700, Junio C Hamano wrote: > > As far as I know, GIT_DIR was prepared as a mechanism to point at > > another .git directory that does not live inside the working tree, not > > as a mechanism to rename

Re: git status doesn't ignore GIT_DIR directory?

2015-05-22 Thread Thorsten von Eicken
On 5/22/2015 7:22 PM, Duy Nguyen wrote: > On Fri, May 22, 2015 at 07:03:48PM -0700, Junio C Hamano wrote: >> As far as I know, GIT_DIR was prepared as a mechanism to point at >> another .git directory that does not live inside the working tree, not >> as a mechanism to rename it to arbitrary name.

Please Acknowledge My Proposal!!

2015-05-22 Thread Gva Abogados
Please Acknowledge My Proposal!! My name is Mr. Juan Martin Domingo a lawyer resident in Spain. I am writing to let you know I have some FUNDS I want to transfer and am seeking if you can be a beneficiary...Do not hesitate to Contact me for more information if interested: gva.abogad...@aim.com)

RE: recovering from "unordered stage entries in index" error

2015-05-22 Thread McHenry, Matt
> So maybe you can do "GIT_TRACE=2 git svn fetch" and post the output. > I'd expect to see something like "git read-tree " before "fatal: > unorder...". You can then use git ls-tree to examine this tree, > try to sort the file list with "LANG=C sort" and compare with the > original list.

Re: git status doesn't ignore GIT_DIR directory?

2015-05-22 Thread Duy Nguyen
On Fri, May 22, 2015 at 07:03:48PM -0700, Junio C Hamano wrote: > As far as I know, GIT_DIR was prepared as a mechanism to point at > another .git directory that does not live inside the working tree, not > as a mechanism to rename it to arbitrary name. E.g. > > $ git init > $ mv .git .svn > $

Re: recovering from "unordered stage entries in index" error

2015-05-22 Thread Duy Nguyen
On Sat, May 23, 2015 at 1:56 AM, McHenry, Matt wrote: > $ git svn fetch > fatal: unordered stage entries in index > write-tree: command returned error: 128 git-svn does not create the index manually. It uses update-index or read-tree to do that. While there's still a chance of bugs in update-inde

Re: git status doesn't ignore GIT_DIR directory?

2015-05-22 Thread Junio C Hamano
As far as I know, GIT_DIR was prepared as a mechanism to point at another .git directory that does not live inside the working tree, not as a mechanism to rename it to arbitrary name. E.g. $ git init $ mv .git .svn $ GIT_DIR=$(pwd)/.svn ; export GIT_DIR is not expected to work. On Fri, May 2

Re: [PATCH/RFC 0/3] using stat() to avoid re-scanning pack dir

2015-05-22 Thread Duy Nguyen
On Sat, May 23, 2015 at 8:19 AM, Duy Nguyen wrote: > But people often just do open operation of a time and this racy is not an > issue. Very bad proof reading. This should read "But people often do one operation at a time.." -- Duy -- To unsubscribe from this list: send the line "unsubscribe gi

Re: [PATCH/RFC 0/3] using stat() to avoid re-scanning pack dir

2015-05-22 Thread Duy Nguyen
On Sat, May 23, 2015 at 6:51 AM, Jeff King wrote: > The other problem is that I'm not sure stat data is enough to notice > when a directory changes. Certainly the mtime should change, but if you > have only one-second resolution on your mtimes, we can be fooled. mtime may or may not change. I bas

git status doesn't ignore GIT_DIR directory?

2015-05-22 Thread Thorsten von Eicken
I renamed my .git directory to _git and I'm surprised that git status thinks that it's an untracked file: $ GIT_DIR=_git git status On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add ..." to include in what will be committed) _git/ nothin

Re: [PATCH v5 3/3] upload-pack: optionally allow fetching reachable sha1

2015-05-22 Thread Junio C Hamano
Fredrik Medley writes: > 2015-05-22 0:15 GMT+02:00 Junio C Hamano : > >> It looks like this new set of tests are well thought out; good job. >> >> I spotted a few minor nits, though. All I'll amend while applying >> so there is no need to resend only to correct them. > > I agree on all your comm

Re: [PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want

2015-05-22 Thread Junio C Hamano
Fredrik Medley writes: >>> +#define ALLOW_TIP_SHA1 01 >>> +static int allow_unadvertised_object_request; >> >> It is better to use "unsigned int" for these bit masks, as we are >> not interested in the top-most bit getting special-cased by using a >> signed type. I'll amend this (and the o

Re: [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions

2015-05-22 Thread Junio C Hamano
Michael Haggerty writes: > I think using 'grep' is OK for now, and if they are internationalized in > the future the breakage will be pretty obvious and straightforward to fix. Yeah, I think so, too. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mess

Re: [PATCH 0/5] Fix verify_lock() to report errors via strbuf

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 4:34 PM, Michael Haggerty wrote: > verify_lock() is a helper function called while committing reference > transactions. But when it fails, instead of recording its error > message in a strbuf to be passed back to the caller of > ref_transaction_commit(), the error message w

Re: [PATCH 1/5] verify_lock(): return 0/-1 rather than struct ref_lock *

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 4:34 PM, Michael Haggerty wrote: > Its return value wasn't conveying any extra information, but it made > the reader wonder whether the ref_lock that it returned might be > different than the one that was passed to it. So change the function > to the traditional "return 0 o

Re: [PATCH v5 3/3] upload-pack: optionally allow fetching reachable sha1

2015-05-22 Thread Fredrik Medley
2015-05-22 0:15 GMT+02:00 Junio C Hamano : > Fredrik Medley writes: > >> --- a/Documentation/technical/protocol-capabilities.txt >> +++ b/Documentation/technical/protocol-capabilities.txt >> @@ -260,6 +260,13 @@ If the upload-pack server advertises this capability, >> fetch-pack may >> send "wan

[PATCH 3/3] prepare_packed_git: use stat_validity to avoid re-reading packs

2015-05-22 Thread Jeff King
When we try to read an object and fail, we call reprepare_packed_git() to re-scan the list of packfiles. This catches any "racy" cases in which somebody is repacking or making new objects. The performance implications of re-scanning the pack directory are not usually a big deal, because failing to

[PATCH 2/3] cache.h: move stat_validity definition up

2015-05-22 Thread Jeff King
It would be nice to embed stat_validity structs inside other structs defined in cache.h. We cannot get away with a forward declaration, because using it in a struct definition means the compiler needs the real size. Signed-off-by: Jeff King --- cache.h | 56 --

[PATCH 1/3] stat_validity: handle non-regular files

2015-05-22 Thread Jeff King
The stat_validity code was originally written to avoid re-reading the packed-refs file when it has not changed. It makes sure that the file continues to match S_ISREG() when we check it. However, we can use the same concept on a directory to see whether it has been modified. Even though we still h

[PATCH/RFC 0/3] using stat() to avoid re-scanning pack dir

2015-05-22 Thread Jeff King
On Fri, May 22, 2015 at 03:02:45PM +, steve.nor...@thomsonreuters.com wrote: > On Friday, May 22, 2015 @ 11:06 AM Duy Nguyen did write: > > > Strange. Maybe there is something else... Anyway some numbers from me. > > This is nfs3 hosted by Raspberry Pi, accessed over wireless. I just > > run

Re: [PATCH v5 2/3] upload-pack: prepare to extend allow-tip-sha1-in-want

2015-05-22 Thread Fredrik Medley
2015-05-22 0:07 GMT+02:00 Junio C Hamano : > Fredrik Medley writes: > >> To allow future extensions, e.g. allowing non-tip sha1, replace the >> boolean allow_tip_sha1_in_want variable with the flag-style >> allow_request_with_bare_object_name variable. >> >> Signed-off-by: Fredrik Medley >> --- >

[PATCH 0/5] Fix verify_lock() to report errors via strbuf

2015-05-22 Thread Michael Haggerty
verify_lock() is a helper function called while committing reference transactions. But when it fails, instead of recording its error message in a strbuf to be passed back to the caller of ref_transaction_commit(), the error message was being written directly to stderr. Instead, report the errors v

[PATCH 4/5] verify_lock(): do not capitalize error messages

2015-05-22 Thread Michael Haggerty
Our convention is for error messages to start with a lower-case letter. Signed-off-by: Michael Haggerty --- refs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index 625e69f..48aff79 100644 --- a/refs.c +++ b/refs.c @@ -2211,12 +2211,12 @@ static int ve

[PATCH 5/5] ref_transaction_commit(): do not capitalize error messages

2015-05-22 Thread Michael Haggerty
Our convention is for error messages to start with a lower-case letter. Signed-off-by: Michael Haggerty --- refs.c| 4 ++-- t/t1400-update-ref.sh | 14 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 48aff79..1d60fcd 100644 ---

[PATCH 1/5] verify_lock(): return 0/-1 rather than struct ref_lock *

2015-05-22 Thread Michael Haggerty
Its return value wasn't conveying any extra information, but it made the reader wonder whether the ref_lock that it returned might be different than the one that was passed to it. So change the function to the traditional "return 0 on success or a negative value on error". Signed-off-by: Michael H

[PATCH 3/5] verify_lock(): report errors via a strbuf

2015-05-22 Thread Michael Haggerty
Instead of writing error messages directly to stderr, write them to a "strbuf *err". In lock_ref_sha1_basic(), arrange for these errors to be returned to its caller. Signed-off-by: Michael Haggerty --- refs.c | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git

[PATCH 2/5] verify_lock(): on errors, let the caller unlock the lock

2015-05-22 Thread Michael Haggerty
The caller already knows how to do it, so always do it in the same place. Signed-off-by: Michael Haggerty --- refs.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 4432bc9..100a767 100644 --- a/refs.c +++ b/refs.c @@ -2209,14 +2209,12 @@ static

Re: [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions

2015-05-22 Thread Michael Haggerty
On 05/14/2015 07:00 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >>> But there is a i18n markings test, for which test-i18ngrep was invented for. >> >> Thanks for the info. I wasn't aware of that facility. >> >> So if I understand correctly, s/grep/test_i18ngrep/ will address your >> co

What's cooking in git.git (May 2015, #06; Fri, 22)

2015-05-22 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 fourth batch of topics have been merged to 'master'. The "untracked cache" series is in 'next', to give it a wider exposure. I do not use

Re: [BUG] "git commit --date" format parsing

2015-05-22 Thread Jeff King
On Fri, May 22, 2015 at 03:18:53PM +0200, Bastien Traverse wrote: > $ git --version > git version 2.4.1 > > $ uname -a > Linux arch-clevo 4.0.4-1-ARCH #1 SMP PREEMPT Mon May 18 06:43:19 CEST > 2015 x86_64 GNU/Linux > > $ mkdir test && cd test/ > $ git init > $ touch test > $ git add test > > 1.

Re: [PATCH 2/2] log: do not shorten decoration names too early

2015-05-22 Thread Jeff King
On Fri, May 22, 2015 at 02:21:16PM -0700, Junio C Hamano wrote: > I ended up doing it as a variant of the latter, "free unless we have > v->buffer pointing at it". Thanks, this version looks good to me minus one micro-nit below. > Sorry for a long delay. No problem. I'm sometimes amazed you fin

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Philip Oakley
From: "Johannes Schindelin" Hi, On 2015-05-22 19:14, Philip Oakley wrote: From: "Johannes Schindelin" On 2015-05-22 11:42, Johannes Schindelin wrote: On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller wrote: On Tue, May 19, 2015 at 12:29 PM, Robert Dailey

Re: [PATCH 2/2] log: do not shorten decoration names too early

2015-05-22 Thread Junio C Hamano
Jeff King writes: > On Thu, May 14, 2015 at 03:25:33PM -0700, Junio C Hamano wrote: > >> @@ -90,6 +97,8 @@ static MAYBE_UNUSED elemtype *slabname## _at(struct >> slabname *s, \ >> \ >> if (s->slab_count <= nth_slab) {

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Philip Oakley
From: "Stefan Beller" It's better to start the man page with a description of what submodules actually are instead of saying what they are not. Reorder the paragraphs such that the first short paragraph introduces the submodule concept, the second paragraph highlights the usage of the submodul

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 1:04 PM, Junio C Hamano wrote: > On Fri, May 22, 2015 at 12:59 PM, Johannes Schindelin > wrote: >> >> On 2015-05-22 21:23, Stefan Beller wrote: >>> >>> So first of all: >>> Where do I find the Amazon SES account for submitGit, to register >>> my email with? >>> >>> Also ca

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread David Aguilar
On Fri, May 22, 2015 at 01:05:28PM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > [just wrapping up the unaswered questions in this thread] > > ... > > On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: > > Thanks for clarifications. I think all is good now? Yes, I think

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread Junio C Hamano
David Aguilar writes: > [just wrapping up the unaswered questions in this thread] > ... > On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: Thanks for clarifications. I think all is good now? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Junio C Hamano
On Fri, May 22, 2015 at 12:59 PM, Johannes Schindelin wrote: > > On 2015-05-22 21:23, Stefan Beller wrote: >> >> So first of all: >> Where do I find the Amazon SES account for submitGit, to register >> my email with? >> >> Also can I change the email in the process or change it before? > > FWIW I

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Johannes Schindelin
Hi Stefan, On 2015-05-22 21:23, Stefan Beller wrote: > Ok, I am trying it out now, all I have left is > > Register your email address > (stefanbel...@googlemail.com) > with submitGit's Amazon SES > account in order for it to send > emails from you. > > So first of all: > Wher

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Johannes Schindelin
Hi, On 2015-05-22 19:14, Philip Oakley wrote: > From: "Johannes Schindelin" >> On 2015-05-22 11:42, Johannes Schindelin wrote: >> >>> On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller wrote: > On Tue, May 19, 2015 at 12:29 PM, Robert Dailey > wrote:

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-22 Thread David Aguilar
[just wrapping up the unaswered questions in this thread] On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote: > > Quoting David Aguilar : > > >+translate_merge_tool_path() { > >+# Use WinMergeU.exe if it exists in $PATH > >+if type -p WinMergeU.exe >/dev/null 2>&1 > >+then

RE: recovering from "unordered stage entries in index" error

2015-05-22 Thread McHenry, Matt
Yes, that does turn up some interesting stuff. It looks like the repository contains some paths with non-ASCII characters, for example this one has some en-dashes (U+2013) in its name: $ svn ls -R svn://dev/trunk/curriculum/Fluency | grep Ninja__Beta Hurix work/source from May 2014/For

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Philip Oakley
From: "Stefan Beller" On Fri, May 22, 2015 at 10:35 AM, Philip Oakley wrote: From: "Stefan Beller" On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: Stefan Beller writes: On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: +Submodules are not to be confused with remotes, w

[PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
It's better to start the man page with a description of what submodules actually are instead of saying what they are not. Reorder the paragraphs such that the first short paragraph introduces the submodule concept, the second paragraph highlights the usage of the submodule command, the third parag

Re: recovering from "unordered stage entries in index" error

2015-05-22 Thread Junio C Hamano
The message "unordered stage entries in index" comes only when two adjacent entries in the index are in a wrong order, e.g. "test0" should come before "test1" but somehow the index records them in the other way around. Doing something like this: $ git ls-files >Q $ LANG=C LC_ALL=C sort Q >R $ diff

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Stefan Beller
Ok, I am trying it out now, all I have left is Register your email address (stefanbel...@googlemail.com) with submitGit's Amazon SES account in order for it to send emails from you. So first of all: Where do I find the Amazon SES account for submitGit, to register my email wit

RE: recovering from "unordered stage entries in index" error

2015-05-22 Thread McHenry, Matt
> > Isn't this failure coming from git-svn that tries to write out a > > tree after it prepared whatever it wants to record in its (possibly > > temporary) index? I have a feeling that the index held by the end > > user is not broken. > > Ahh that would explain why ls-files works. Yep. I

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Eric Sunshine
On Fri, May 22, 2015 at 2:01 PM, Allen Hubbe wrote: > On Fri, May 22, 2015 at 12:53 PM, Eric Sunshine > wrote: >> On Fri, May 22, 2015 at 8:12 AM, Allen Hubbe wrote: For the same reason, I'm not convinced that "simple" is a good name. "sendmail" may indeed be a more appropriate name,

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Allen Hubbe
On Fri, May 22, 2015 at 1:17 PM, Junio C Hamano wrote: > Allen Hubbe writes: > >> On Fri, May 22, 2015 at 10:44 AM, Junio C Hamano wrote: >> >>> Let me step back a bit. Earlier you said your aim is not to use an >>> alias file you already have and use with the MUA/MTA, but to have a >>> collect

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Allen Hubbe
On Fri, May 22, 2015 at 12:53 PM, Eric Sunshine wrote: > On Fri, May 22, 2015 at 8:12 AM, Allen Hubbe wrote: >> On Fri, May 22, 2015 at 12:29 AM, Eric Sunshine >> wrote: >>> On Thu, May 21, 2015 at 11:40 PM, Allen Hubbe wrote: +If the format is 'simple', then the alias file format is desc

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 10:35 AM, Philip Oakley wrote: > From: "Stefan Beller" >> >> On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: >>> >>> Stefan Beller writes: >>> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: >> >> +Submodules are not to be confused with re

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Philip Oakley
From: "Junio C Hamano" Roberto Tyley writes: Hello, I'm stepping up to do that work :) Or at least, I'm implementing a one-way GitHub PR -> Mailing list tool, called submitGit: https://submitgit.herokuapp.com/ Yay ;-) Here's what a user does: * create a PR on https://github.com/git/git

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Philip Oakley
From: "Stefan Beller" On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: Stefan Beller writes: On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: +Submodules are not to be confused with remotes, which are meant +mainly for branches of the same project; This use of 'branches' didn

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Junio C Hamano
Stefan Beller writes: > On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: > +Submodules are not to be confused with remotes, which are meant > +mainly for branches of the same project;

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Junio C Hamano
Allen Hubbe writes: > On Fri, May 22, 2015 at 10:44 AM, Junio C Hamano wrote: > >> Let me step back a bit. Earlier you said your aim is not to use an >> alias file you already have and use with the MUA/MTA, but to have a >> collection of aliases to use with git-send-email only. Is there a >> r

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Philip Oakley
From: "Johannes Schindelin" Hi Roberto, On 2015-05-22 11:42, Johannes Schindelin wrote: On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller wrote: On Tue, May 19, 2015 at 12:29 PM, Robert Dailey wrote: > How do you send your patches inline? [snip] This workfl

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 7:14 AM, Johannes Schindelin wrote: > Hi Paul, > > On 2015-05-22 15:48, Paul Tan wrote: >> On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: >>> Johannes Schindelin writes: >>> >> - fprintf(stderr, >> - _("There are no can

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 7:36 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: +Submodules are not to be confused with remotes, which are meant +mainly for branches of the same project; >>> >>> This use of 'branches' didn't wor

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Eric Sunshine
On Fri, May 22, 2015 at 8:12 AM, Allen Hubbe wrote: > On Fri, May 22, 2015 at 12:29 AM, Eric Sunshine > wrote: >> On Thu, May 21, 2015 at 11:40 PM, Allen Hubbe wrote: >>> +If the format is 'simple', then the alias file format is described below. >>> +Descriptions of the other file formats to th

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 1:33 AM, Roberto Tyley wrote: > On Tuesday, 19 May 2015, Stefan Beller wrote: >> On Tue, May 19, 2015 at 12:29 PM, Robert Dailey >> wrote: >> > How do you send your patches inline? > [snip] >> This workflow discussion was a topic at the GitMerge2015 conference, >> and the

Re: [PATCH] test_bitmap_walk: free bitmap with bitmap_free

2015-05-22 Thread Stefan Beller
On Thu, May 21, 2015 at 5:53 PM, Jeff King wrote: > Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) > noticed that we leak the "result" bitmap. But we should use > "bitmap_free" rather than straight "free", as the former > remembers to free the bitmap array pointed to by the struct. > >

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Junio C Hamano
Roberto Tyley writes: > Here's what a user does: > > * create a PR on https://github.com/git/git > * logs into https://submitgit.herokuapp.com/ with GitHub auth Hmm, this seems to request too much authorization, though. Repositories Public only This application will be able to read

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Matthieu Moy
Roberto Tyley writes: > Hello, I'm stepping up to do that work :) Or at least, I'm implementing a > one-way GitHub PR -> Mailing list tool, called submitGit: > > https://submitgit.herokuapp.com/ This is absolutely awsome. A few thoughts after testing the system to send two patches: * This is aw

Re: [PATCH v2] doc: fix inconsistent spelling of "packfile"

2015-05-22 Thread Junio C Hamano
Patrick Steinhardt writes: > Fix remaining instances where "pack-file" is used instead of > "packfile". Some places remain where we still use "pack-file", > This is the case when we explicitly refer to a file with a > ".pack" extension as opposed to a data source providing a pack > data stream.

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite

2015-05-22 Thread Junio C Hamano
Matthieu Moy writes: >> And please sign-off your patches. > > Ah, I was testing submitGit, and forgot that send-email was usually > doing this for me. Ah, should have noticed from the message-id. Roberto, isn't your threading of multi-patch series busted? Why is 1/2 a follow-up to 2/2? Do you

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite

2015-05-22 Thread Junio C Hamano
Junio C Hamano writes: >> +cat >expected.data <> +$(git rev-parse C) $(git rev-parse HEAD^) >> +$(git rev-parse D) $(git rev-parse HEAD) >> +EOF > > By using a dash to start the here-document like this: > ... Sorry, I should have checked, as I know you know that <<-EOF thing. Your patch is d

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Allen Hubbe
On Fri, May 22, 2015 at 10:44 AM, Junio C Hamano wrote: > Allen Hubbe writes: > >> It depends what we want to do with this parser: accept existing >> sendmail aliases files in git, or enforce that git alias files are >> usable for sendmail. I really don't expect the second to ever happen. >> The

RE: Troubleshoot clone issue to NFS.

2015-05-22 Thread steve.norman
On Friday, May 22, 2015 @ 11:06 AM Duy Nguyen did write: > Strange. Maybe there is something else... Anyway some numbers from me. > This is nfs3 hosted by Raspberry Pi, accessed over wireless. I just > run index-pack on git.git pack instead of full clone. > > - v1.8.4.1 34s > - v1.8.4.2 519s (o

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite

2015-05-22 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> The 'exec' command is sending the current commit to stopped-sha, which is >> supposed to contain the original commit (before rebase). As a result, if >> an 'exec' command fails, the next 'git rebase --continue' will send the >> current commit as

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Junio C Hamano
Allen Hubbe writes: > It depends what we want to do with this parser: accept existing > sendmail aliases files in git, or enforce that git alias files are > usable for sendmail. I really don't expect the second to ever happen. > The first, maybe, but only if the alias file is edited to remove >

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Johannes Schindelin
Hi Roberto, On 2015-05-22 11:42, Johannes Schindelin wrote: > On 2015-05-22 10:33, Roberto Tyley wrote: >> On Tuesday, 19 May 2015, Stefan Beller wrote: >>> On Tue, May 19, 2015 at 12:29 PM, Robert Dailey >>> wrote: >>> > How do you send your patches inline? >> [snip] >>> This workflow discussi

Pushing and pulling the result of `git replace` and objects/info/alternates

2015-05-22 Thread Stephen Kelly
Hello, I have an 'integration repo' which contains other git repos as submodules. One of the submodules is to be split in two to extract a library. A common way of doing that is to use git-filter-branch. A disadvantage of that is that it results in duplicated partial-history in the extracted rep

Re: Troubleshoot clone issue to NFS.

2015-05-22 Thread Junio C Hamano
Duy Nguyen writes: > Strange. Maybe there is something else... Anyway some numbers from me. > This is nfs3 hosted by Raspberry Pi, accessed over wireless. I just > run index-pack on git.git pack instead of full clone. So the checkout codepath to touch working tree is one difference? Are there ot

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Junio C Hamano
Stefan Beller writes: > On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: >>> +Submodules are not to be confused with remotes, which are meant >>> +mainly for branches of the same project; >> >> This use of 'branches' didn't work for me. "remotes are meant mainly for >> branches of the same

Re: [PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite

2015-05-22 Thread Junio C Hamano
Matthieu Moy writes: > The 'exec' command is sending the current commit to stopped-sha, which is > supposed to contain the original commit (before rebase). As a result, if > an 'exec' command fails, the next 'git rebase --continue' will send the > current commit as to the post-rewrite hook. > >

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Junio C Hamano
Roberto Tyley writes: > Hello, I'm stepping up to do that work :) Or at least, I'm implementing a > one-way GitHub PR -> Mailing list tool, called submitGit: > > https://submitgit.herokuapp.com/ Yay ;-) > Here's what a user does: > > * create a PR on https://github.com/git/git > * logs into htt

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Johannes Schindelin
Hi Paul, On 2015-05-22 15:48, Paul Tan wrote: > On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> > - fprintf(stderr, > - _("There are no candidates for merging among the > refs that you just fetched.\n" >>>

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Paul Tan
On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > - fprintf(stderr, - _("There are no candidates for merging among the refs that you just fetched.\n" - "Generally this means that y

Query on git submodules

2015-05-22 Thread Frawley, Sarah
Hi there I am a design automation engineer supporting 200+ designers who use git for hardware design.  We also use the submodule feature where we can have quite complex hierarchy's with 10+ layers.  We have experience issues with re-use of design projects was we move from one derivative to anoth

Re: [PATCH 02/14] pull: pass verbosity, --progress flags to fetch and merge

2015-05-22 Thread Paul Tan
Hi Johannes, On Thu, May 21, 2015 at 11:59 PM, Johannes Schindelin wrote: > Hi Paul, > > On 2015-05-21 11:48, Paul Tan wrote: >> Unfortunately, the usage of strbuf means that we lose the ability to >> know if an option was not provided at all (the value is NULL). This is >> important as some of t

[PATCH 1/2] rebase -i: demonstrate incorrect behavior of post-rewrite

2015-05-22 Thread Matthieu Moy
The 'exec' command is sending the current commit to stopped-sha, which is supposed to contain the original commit (before rebase). As a result, if an 'exec' command fails, the next 'git rebase --continue' will send the current commit as to the post-rewrite hook. The test currently fails with : -

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Stefan Näwe
Am 22.05.2015 um 10:33 schrieb Roberto Tyley: > [...] > Hello, I'm stepping up to do that work :) Or at least, I'm implementing a > one-way GitHub PR -> Mailing list tool, called submitGit: > > https://submitgit.herokuapp.com/ That looks really promising! I wonder if that wouldn't make a good add

Re: [PATCH v3] pull: handle --log=

2015-05-22 Thread Paul Tan
Hi Junio, On Fri, May 22, 2015 at 5:24 AM, Junio C Hamano wrote: > Paul Tan writes: > >> So, here's the re-rolled patch. > > Sigh, too late. > > I thought the previous round was good enough and the patch is > already on 'next'. > > If the incremental change is still worth doing on top, please do

[PATCH 2/2] rebase -i: fix post-rewrite hook with failed exec command

2015-05-22 Thread Matthieu Moy
Usually, when 'git rebase' stops before completing the rebase, it is to give the user an opportunity to edit a commit (e.g. with the 'edit' command). In such cases, 'git rebase' leaves the sha1 of the commit being rewritten in "$state_dir"/stopped-sha, and subsequent 'git rebase --continue' will ca

[BUG] "git commit --date" format parsing

2015-05-22 Thread Bastien Traverse
Hi * Trying to specify a commit (author) date using `--date` option yields unpredictable results that are incoherent with man git-commit: $ git --version git version 2.4.1 $ uname -a Linux arch-clevo 4.0.4-1-ARCH #1 SMP PREEMPT Mon May 18 06:43:19 CEST 2015 x86_64 GNU/Linux $ mkdir test && cd t

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Sebastian Schuberth
On 5/22/2015 10:33, Roberto Tyley wrote: Hello, I'm stepping up to do that work :) Or at least, I'm implementing a one-way GitHub PR -> Mailing list tool, called submitGit: https://submitgit.herokuapp.com/ That's fantastic! Me being the one who brought up that topic at the Git Merge contribu

Re: [PATCH 2/4] ref-filter: add ref-filter API

2015-05-22 Thread karthik nayak
On 05/22/2015 12:14 PM, Matthieu Moy wrote: karthik nayak writes: I miss a high-level description of what the code is doing. Essentially, there's the complete repository list of refs, and you want to filter only some of them, right? From the name, I would guess that ref_filter is the stru

Re: [PATCH 2/4] ref-filter: add ref-filter API

2015-05-22 Thread karthik nayak
On 05/22/2015 12:10 AM, Eric Sunshine wrote: On Thu, May 21, 2015 at 1:30 PM, karthik nayak wrote: On 05/21/2015 12:37 AM, Eric Sunshine wrote: On Wed, May 20, 2015 at 9:18 AM, Karthik Nayak wrote: Makefile | 1 + ref-filter.c | 73

Re: [PATCH v2] send-email: Add simple email aliases format

2015-05-22 Thread Allen Hubbe
On Thu, May 21, 2015 at 11:59 PM, Eric Sunshine wrote: > On Thu, May 21, 2015 at 11:19 PM, Allen Hubbe wrote: >> On May 21, 2015 9:05 PM, "Eric Sunshine" wrote: >>> On Thu, May 21, 2015 at 8:16 PM, Allen Hubbe wrote: >>> > +test_expect_success $PREREQ 'sendemail.aliasfiletype=simple' ' >>> > +

Re: [PATCH v4] send-email: Add simple email aliases format

2015-05-22 Thread Allen Hubbe
On Fri, May 22, 2015 at 12:29 AM, Eric Sunshine wrote: > On Thu, May 21, 2015 at 11:40 PM, Allen Hubbe wrote: >> This format is more simple than the other alias file formats, so it may >> be preferred by some users. [...] >> Signed-off-by: Allen Hubbe >> --- >> diff --git a/Documentation/git-sen

Re: Troubleshoot clone issue to NFS.

2015-05-22 Thread Duy Nguyen
On Fri, May 22, 2015 at 3:35 PM, wrote: > Tested this change on a couple of versions, first of all on the revision > where things go wrong for me: > > ... > > ~ $ time git clone https://github.com/git/git test > > real0m8.263s > user0m10.550s > sys 0m3.763s > > ~ $ time git clone http

Re: [Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Johannes Schindelin
Hi Roberto, On 2015-05-22 10:33, Roberto Tyley wrote: > On Tuesday, 19 May 2015, Stefan Beller wrote: >> On Tue, May 19, 2015 at 12:29 PM, Robert Dailey >> wrote: >> > How do you send your patches inline? > [snip] >> This workflow discussion was a topic at the GitMerge2015 conference, >> and the

Re: Diffing submodule does not yield complete logs for merge commits

2015-05-22 Thread Roberto Tyley
On Tuesday, 19 May 2015, Stefan Beller wrote: > On Tue, May 19, 2015 at 12:29 PM, Robert Dailey > wrote: > > How do you send your patches inline? > > This workflow discussion was a topic at the GitMerge2015 conference, > and there are essentially 2 groups, those who know how to send email > and t

RE: Troubleshoot clone issue to NFS.

2015-05-22 Thread steve.norman
On Friday, May 22, 2015 @ 8:12 AM Jeff King did scribble: > > In builtin/index-pack.c, replace the line "collision_test_needed = > > has_sha1_file(sha1);" with "collision_test_needed = 0;". Security is > > compromised but for this test it should be ok. Then clone again. I > > hope the new number g

[Announce] submitGit for patch submission (was "Diffing submodule does not yield complete logs")

2015-05-22 Thread Roberto Tyley
On Tuesday, 19 May 2015, Stefan Beller wrote: > On Tue, May 19, 2015 at 12:29 PM, Robert Dailey > wrote: > > How do you send your patches inline? [snip] > This workflow discussion was a topic at the GitMerge2015 conference, > and there are essentially 2 groups, those who know how to send email >

Re: Troubleshoot clone issue to NFS.

2015-05-22 Thread Jeff King
On Fri, May 22, 2015 at 07:16:54AM +0700, Duy Nguyen wrote: > > Is there anything else I can provide or test? > > In builtin/index-pack.c, replace the line "collision_test_needed = > has_sha1_file(sha1);" with "collision_test_needed = 0;". Security is > compromised but for this test it should be

Re: [PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-22 Thread Philip Oakley
From: "Stefan Beller" On Thu, May 21, 2015 at 1:03 PM, Philip Oakley wrote: +Submodules are not to be confused with remotes, which are meant +mainly for branches of the same project; This use of 'branches' didn't work for me. "remotes are meant mainly for branches of the same project" ?