[PATCH v2 1/2] [GSoC] diff: rename read_directory()

2014-03-19 Thread Brian Bourn
From: Brian Bourn ba.bo...@gmail.com It is desirable to replace manual checking of . or .. in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h. However, dir.h declares a read_directory which conflicts with a (different) static read_directory() defined in in diff-no-index.c. As a

[PATCH v2 2/2] [GSoC] diff:use is_dot_or_dotdot() in code

2014-03-19 Thread Brian Bourn
From: Brian Bourn ba.bo...@gmail.com Subject: replace manual ./.. check with is_dot_or_dotdot() Signed-off-by: Brian Bourn ba.bo...@gmail.com --- Part 2 of my GSoC submission where the actual change is made diff-no-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Duy Nguyen
On Wed, Mar 19, 2014 at 7:46 AM, sza...@chromium.org wrote: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-19 Thread Torsten Bögershausen
On 03/18/2014 11:00 AM, Benoit Pierre wrote: Don't change git environment: move the GIT_EDITOR=: override to the hook command subprocess, like it's already done for GIT_INDEX_FILE. Signed-off-by: Benoit Pierre benoit.pie...@gmail.com --- builtin/checkout.c | 8 builtin/clone.c

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Stefan Zager
On Wed, Mar 19, 2014 at 12:30 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Mar 19, 2014 at 7:46 AM, sza...@chromium.org wrote: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile

Re: [PATCH v2 1/2] [GSoC] diff: rename read_directory()

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 2:29 AM, Brian Bourn ba.bo...@gmail.com wrote: Subject: diff: rename read_directory() I think you mean diff-no-index rather than diff. From: Brian Bourn ba.bo...@gmail.com Unless this is intentionally different from the address from which you sent the email, you

Re: [PATCH v2 2/2] [GSoC] diff:use is_dot_or_dotdot() in code

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 2:29 AM, Brian Bourn ba.bo...@gmail.com wrote: Subject: diff:use is_dot_or_dotdot() in code Wrong subject. See below. From: Brian Bourn ba.bo...@gmail.com Drop this. git am will grab your name and address automatically from the email header when applying the patch.

[PATCH] diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function.

2014-03-19 Thread Andrei Dinu
is_dot_or_dotdot() verifies if the name of the directory sent as parameter to this function is the same with '.' or '..' and returns 0 if that is true. There is unnecessary to iterate each character of the char* argument and verify it with strcmp because if there is a match that is at the

Re: [GSoC14][RFC] Is there any interest in adding a port of checkpatch.pl to contrib/?

2014-03-19 Thread demerphq
On 18 March 2014 02:38, Jacopo Notarstefano jacopo.notarstef...@gmail.com wrote: 3. As far as I can tell, checkpatch needs to be run from the root folder of a linux repository clone. Cloning several hundred MBs for a single perl script looks a little foolish to me. If that is your worry maybe

Re: [PATCH] rev-parse --parseopt: option argument name hints

2014-03-19 Thread Ilya Bobyr
On 3/12/2014 9:59 AM, Junio C Hamano wrote: Ilya Bobyr ilya.bo...@gmail.com writes: I though that an example just to describe `argh' while useful would look a bit disproportional, compared to the amount of text on --parseopt. But now that I've added a Usage text section to looks quite in

[PATCH] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread David Kastrup
The default of 16MiB causes serious thrashing for large delta chains combined with large files. --- 128MiB seems like a big bump, but the limit for files not getting delta compressed at all is 512MiB and it would appear that they should be a bit comparable. It is hard to find good benchmarks

Re: [PATCH][GSOC] Selection of the verbose message is replaced with generated message in install_branch_config()

2014-03-19 Thread Eric Sunshine
Thanks for the resubmission. Comments below... On Tue, Mar 18, 2014 at 10:33 AM, Aleksey Mokhovikov moxobu...@gmail.com wrote: Subject: [PATCH][GSOC] Selection of the verbose message is replaced with generated message in install_branch_config() Say [PATCH v2] to indicate your second attempt.

Re: [PATCH] fsck.c:fsck_commit() use starts_with() and skip_prefix()

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 5:04 AM, Othman Darraz darraz...@gmail.com wrote: 2014-03-19 0:12 GMT+01:00 Eric Sunshine sunsh...@sunshineco.com: On Tue, Mar 18, 2014 at 7:09 PM, Eric Sunshine sunsh...@sunshineco.com wrote: diff --git a/fsck.c b/fsck.c index 64bf279..5eae856 100644 --- a/fsck.c

Re: [PATCH] diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function.

2014-03-19 Thread Eric Sunshine
Thanks for the submission. Comments below to give you a taste of the Git review process... On Wed, Mar 19, 2014 at 4:31 AM, Andrei Dinu mandrei.d...@gmail.com wrote: Subject: diff-no-index.c: rewrote read_directory() to use is_dot_or_dotdot() function. Use imperative tone: rewrite instead of

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-19 Thread Eric Sunshine
On Mon, Mar 17, 2014 at 5:30 PM, Hiroyuki Sano sh19910...@gmail.com wrote: Including dir.h in diff-no-index.c, it causes a compile error, because the same name function read_directory() is declared globally in dir.h. This change is to avoid conflicts as above. This explanation is slightly

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Duy Nguyen
On Wed, Mar 19, 2014 at 2:50 PM, Stefan Zager sza...@chromium.org wrote: On Wed, Mar 19, 2014 at 12:30 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Mar 19, 2014 at 7:46 AM, sza...@chromium.org wrote: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse

Re: What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-19 Thread Max Horn
On 17.03.2014, at 18:01, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-03-14 23.09, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit - remote-hg: do not fail on invalid bookmarks Reported to break tests

[BUG] Segfault on git describe

2014-03-19 Thread Sylvestre Ledru
Hello, Trying to do some stats using the Firefox git repository (https://github.com/mozilla/gecko-dev), I found a bug on git describe. The following command will segfault: git describe --contains a9ff31aebd6dbda82a3c733a72eeeaa0b0525b96 Please note that the Firefox history is a pretty long and

[PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Brian Gesiak
Teach rebase the same shorthand as checkout and merge; that is, that - means the branch we were previously on. Reported-by: Tim Chase g...@tim.thechases.com Signed-off-by: Brian Gesiak modoca...@gmail.com --- git-rebase.sh | 4 t/t3400-rebase.sh | 11 +++ 2 files changed, 15

Re: [PATCH 4/4] gc --aggressive: three phase repacking

2014-03-19 Thread Duy Nguyen
On Tue, Mar 18, 2014 at 12:00 PM, Duy Nguyen pclo...@gmail.com wrote: size time old aggr. 36MB 5m51 new aggr. 37MB 6m13 repack -adf 48MB 1m12 I am not clear on what these times mean. It looks like the new code is slower _and_ bigger. Can you explain them? That's right

Configuring a third-party git hook

2014-03-19 Thread Chris Angelico
I have a bit of a weird question. Poking around with Google searches hasn't come up with any results, so I'm asking here :) Short version: What's the most appropriate way to configure a git hook? Long version: I have a git hook (handles prepare-commit-msg and commit-msg) and part of what it does

Financial Service / Loan Service

2014-03-19 Thread Santander Group
We offer all purpose loan at 3% interest rate. Contact Us for more details by Email:santanderfinancegr...@gmail.com -- 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

[PATCH v2 2/3][GSOC] diff: use is_dot_or_dotdot() instead of strcmp()

2014-03-19 Thread Hiroyuki Sano
The is_dot_or_dotdot() is used to check if the string is either . or ... Include the dir.h header file to use is_dot_or_dotdot(). Signed-off-by: Hiroyuki Sano sh19910...@gmail.com --- diff-no-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff-no-index.c

Re: What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-19 Thread Max Horn
On 19.03.2014, at 11:53, Max Horn m...@quendi.de wrote: On 17.03.2014, at 18:01, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-03-14 23.09, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit - remote-hg: do not

[PATCH 1/3] remote-hg: do not fail on invalid bookmarks

2014-03-19 Thread Max Horn
From: Antoine Pelisse apeli...@gmail.com Mercurial can have bookmarks pointing to nullid (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import will fail because git-remote-hg will not be able

[PATCH 2/3] remote-hg: allow invalid bookmarks in a few edge cases

2014-03-19 Thread Max Horn
Fix the previous commit to workaround issues with edge cases: Specifically, remote-hg inserts a fake 'master' branch, unless the cloned hg repository already contains a 'master' bookmark. If that 'master' bookmark happens to reference the 'null' commit, the preceding fix ignores it. This would

[PATCH 3/3] remote-hg: add test cases for null bookmarks

2014-03-19 Thread Max Horn
Signed-off-by: Max Horn m...@quendi.de --- contrib/remote-helpers/test-hg.sh | 48 +++ 1 file changed, 48 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index a933b1e..8d01b32 100755 ---

[PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread David Kastrup
The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Forgot the signoff. For the rationale of this patch and the 128MiB choice, see the original patch. Documentation/config.txt | 2 +- environment.c

Re: [PATCH 2/3] remote-hg: allow invalid bookmarks in a few edge cases

2014-03-19 Thread Antoine Pelisse
Hi Max, Thank you for working on this. I believe it would be fair that you forget about patch 1/3 as you fix it in this patch (2/3). Also, I think it would be best NOT to integrate a patch (mine) that breaks a test, as it would make bisect harder to use. Thanks, Antoine On Wed, Mar 19, 2014 at

Confirm Receipt

2014-03-19 Thread Mrs.Supini Thrunkul
Hello, I am Mrs.Supini Thrunkul from Tai Yau Bank Hong Kong,I need your cooperation to transfer $47.3 million US Dollars to any trusted account within your control. Contact me for more details. Mrs.Supini Thrunkul Tel: +85 2580 848 65 -- To unsubscribe from this list: send the line

[PATCH v2] diff-no-index.c : rewrite read_directory() to use is_dot_or_dotdot().

2014-03-19 Thread Andrei Dinu
replace manual ./.. check with is_dot_or_dotdot(). choose to implement my own function because did't find the defined one. [1]: http://article.gmane.org/gmane.comp.version-control.git/244420 Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I plan on applying to GSoc 2014

Loan Offer

2014-03-19 Thread JamesInvestmentCompany31325
Good Day, I am a private lender i give out Guarantee Business Loans,Personal Loans,Automobile Purchase Loans,House Purchase Loans, Car Loans E.T.C i give out long term loan ranging from $2,000.00 to $1,000,000.00 from One to Fifty years maximum with 3% interest rate if interested reply with

Re: [PATCH v2] diff-no-index.c : rewrite read_directory() to use is_dot_or_dotdot().

2014-03-19 Thread Matthieu Moy
Andrei Dinu mandrei.d...@gmail.com writes: replace manual ./.. check with is_dot_or_dotdot(). This is not what the patch below does. choose to implement my own function because did't find the defined one. That does not seem to be a good reason to me. Run git grep is_dot_or_dotdot in

[PATCHv2] fsck.c:fsck_commit() use skip_prefix() and starts_with()

2014-03-19 Thread Othman Darraz
make buffer const char* because the content of the memory referenced by this variable doesn't change in this function. Add cast to buffer to match fsck_ident signature which is (char**,...) use skip_prefix() instead of memcmp() to avoid using magic number. Signed-off-by: Othman Darraz

Unexpected difference between core.autocrlf=true and .gitattributes text=auto

2014-03-19 Thread Marc Strapetz
I have a file.txt which is stored with CRLF in the repository (I'm on Windows, but that should not matter). autocrlf has been set: $ git config core.autocrlf true Git considers the working tree clean: $ touch file.txt $ git status On branch master nothing to commit, working directory clean

Re: [PATCH 2/3] remote-hg: allow invalid bookmarks in a few edge cases

2014-03-19 Thread Max Horn
Hi Antoine, On 19.03.2014, at 14:07, Antoine Pelisse apeli...@gmail.com wrote: Hi Max, Thank you for working on this. I believe it would be fair that you forget about patch 1/3 as you fix it in this patch (2/3). Also, I think it would be best NOT to integrate a patch (mine) that breaks a

[PATCH 1/3] diff-no-index.c read_directory() use is_dot_or_dotdot().

2014-03-19 Thread Andrei Dinu
Implement read_directory() to use is_dot_or_dotdot() function from dir.h instead of strcmp(). Rename read_directory() in read_directory_path() to avoid conflicting with read_directory() from dir.h. Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I plan on applying to GSoc 2014.

Re: [PATCH 2/3] remote-hg: allow invalid bookmarks in a few edge cases

2014-03-19 Thread Antoine Pelisse
On Wed, Mar 19, 2014 at 4:00 PM, Max Horn m...@quendi.de wrote: Thank you for working on this. I believe it would be fair that you forget about patch 1/3 as you fix it in this patch (2/3). Also, I think it would be best NOT to integrate a patch (mine) that breaks a test, as it would make

Re: [PATCH 1/3] diff-no-index.c read_directory() use is_dot_or_dotdot().

2014-03-19 Thread Matthieu Moy
Subject: Re: [PATCH 1/3] ^^^ I guess you meant PATCH v3. 1/3 means that this is the first patch out of 3. Andrei Dinu mandrei.d...@gmail.com writes: Implement read_directory() to use is_dot_or_dotdot() function from dir.h instead of strcmp(). Rename read_directory() in

[PATCH v4 1/2] diff-no-index.c: rename read_directory()

2014-03-19 Thread Andrei Dinu
Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I plan on applying to GSoc 2014 diff-no-index.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 8e10bff..5e4a76c 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@

[PATCH v4 2/2] diff-no-index.c: read_directory_path() use is_dot_or_dotdot().

2014-03-19 Thread Andrei Dinu
Implement code so read_directory_path() use is_dot_or_dotdot() from dir.h instead of strcmp(). Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I plan on applying to GSoc 2014. diff-no-index.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff-no-index.c

[PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

2014-03-19 Thread Brian Bourn
It would be desirable to replace manual checking of . or .. in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h, however, dir.h declares a read_directory() which conflicts with a (different) static read_directory() defined in diff-no-index.c. As a preparatory step, rename the

[PATCH v3 2/2][GSoC] diff-no-index: replace manual ./.. check with is_dot_or_dotdot()

2014-03-19 Thread Brian Bourn
Signed-off-by: Brian Bourn ba.bo...@gmail.com --- Part 2 of my submission for GSoC diff-no-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff-no-index.c b/diff-no-index.c index ec51106..c554691 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -15,6 +15,7 @@

[PATCH v5] fsck.c: fsck_tree() now use is_dot_or_dotdot().

2014-03-19 Thread Andrei Dinu
Rewrite fsck_tree() to use is_dot_or_dotdot() from dir.h. Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I try to find other sites that can use id_dot_or_dotdot() function. fsck.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fsck.c b/fsck.c index

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Stefan Zager
On Wed, Mar 19, 2014 at 3:28 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Mar 19, 2014 at 2:50 PM, Stefan Zager sza...@chromium.org wrote: I suppose it would be possible to fix the immediate problem just by using one fd per thread, without a new pread implementation. But it seems better

Re: [PATCH 4/7] commit: fix patch hunk editing with commit -p -m

2014-03-19 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: +int run_hook_with_custom_index(const char *index_file, const char *name, ...) +{ +const char *hook_env[3] = { NULL }; +char index[PATH_MAX]; Sorry being late with the review. Recently some effort has been put to replace the

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Uwe Storbeck wrote: + printf '%s\n' $@ | sed -e 's/^/# /' This is wrong, isn't it? Why do we want one line per item here? Yes, Hannes caught the same, too. Sorry for the

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Uwe Storbeck wrote: + printf '%s\n' $@ | sed -e 's/^/# /' This is wrong, isn't it? Why do we want one line per item here? Yes, Hannes caught the same, too. Sorry for the sloppiness. We currently use echo all over

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Hiroyuki Sano sh19910...@gmail.com writes: Including dir.h in diff-no-index.c, it causes a compile error, because the same name function read_directory() is declared globally in dir.h. This change is to avoid conflicts as above. Signed-off-by:

Re: [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell

2014-03-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Mar 18, 2014 at 03:16:27PM -0700, Junio C Hamano wrote: Isn't GIT_CONFIG here another way of saying: test_must_fail git config -f doesnotexist --list Perhaps that is shorter and more readable still (and there are a few similar cases in this

Re: [PATCH v4 1/2] diff-no-index.c: rename read_directory()

2014-03-19 Thread Matthieu Moy
Andrei Dinu mandrei.d...@gmail.com writes: Signed-off-by: Andrei Dinu mandrei.d...@gmail.com The commit message should explain why this is a good change. In general, the why? question is more important than the what (the reader can see from the patch that you renamed the function, but cannot

[GSoc 2014 Project Ideas].

2014-03-19 Thread Andrei Dinu
Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- Hello, I'm interested in Improve triangular workflow support project idea. Can you give me, please, further information about this project? Thank you very much! -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
Brian Gesiak modoca...@gmail.com writes: diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 6d94b1f..6176754 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -88,6 +88,17 @@ test_expect_success 'rebase from ambiguous branch name' ' git rebase master '

Re: [PATCH v5] fsck.c: fsck_tree() now use is_dot_or_dotdot().

2014-03-19 Thread Matthieu Moy
Andrei Dinu mandrei.d...@gmail.com writes: --- I try to find other sites that can use id_dot_or_dotdot() function. This should also have been sent in the same series. @@ -171,10 +172,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func)

Re: What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-19 Thread Max Horn
Am 19.03.2014 um 18:04 schrieb Junio C Hamano gits...@pobox.com: Max Horn m...@quendi.de writes: On 17.03.2014, at 18:01, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-03-14 23.09, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to @{-1}. instead of Fast-forwarded HEAD to -. Somebody may later

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Brian Gesiak
Thank you for the feedback and tweaks! Is the eye-candy output to the standard output what is the most interesting during the execution of a rebase? Wouldn't we be more interested to make sure that we did transplant the history on the same commit between two cases? I agree. I'll consult the

Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

2014-03-19 Thread Junio C Hamano
Brian Bourn ba.bo...@gmail.com writes: It would be desirable to replace manual checking of . or .. in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h, however, dir.h declares a read_directory() which conflicts with a (different) static read_directory() defined in

Re: [PATCH v2 3/3][GSOC] fsck: replace if-statements to logical expressions

2014-03-19 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: There were two different ways to check flag values, one way is using if-statement, and the other way is using logical expression. To make sensible, replace if-statements to logical expressions in fsck_tree(). The change described by these two

Re: [PATCH 1/3][GSOC] diff: rename read_directory() to get_directory_list()

2014-03-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: -static int read_directory(const char *path, struct string_list *list) +static int get_directory_list(const char *path, struct string_list *list) Renaming is a good idea but the new name sounds like you are grabbing the names of directories, ignoring

Re: [PATCH] rev-parse --parseopt: option argument name hints

2014-03-19 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: I can not find this particular patch in the latest What's cooking email. Is there something I can do? IIRC, I think I was waiting for the version with a new Usage text section to the documentation you alluded to in this exchange ($gmane/243924):

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to @{-1}. instead of

Re: [PATCH v3 1/2][GSoC] diff-no-index: rename read_directory()

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 2:31 PM, Junio C Hamano gits...@pobox.com wrote: Brian Bourn ba.bo...@gmail.com writes: It would be desirable to replace manual checking of . or .. in diff-no-index.c with is_dot_or_dotdot(), which is defined in dir.h, however, dir.h declares a read_directory() which

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Stefan Zager
On Wed, Mar 19, 2014 at 9:57 AM, Stefan Zager sza...@chromium.org wrote: I still don't understand how compat/pread.c does not work with pack_fd per thread. I don't have Windows to test, but I forced compat/pread.c on on Linux with similar pack_fd changes and it worked fine, helgrind only

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Uwe Storbeck wrote: +printf '%s\n' $@ | sed -e 's/^/# /' This is wrong, isn't it? Why do we want one line per item here? Yes,

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First,

[PATCH] t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

2014-03-19 Thread Sebastian Schuberth
On MINGW, pwd is defined as pwd -W in test-lib.sh. This usually is the right thing, but the absolute Windows path with a colon confuses rsync. We could use $PWD in this case to work around the issue, but in fact there is no need to use an absolute path in the first place, so get rid of it. This

[RFC][GSoC] Calling for comments regarding rough draft of proposal

2014-03-19 Thread tanay abhra
Hi, I have already done the microproject, which has been merged into main last week. I have prepared a rough draft of my proposal for review, read all the previous mailing list threads about it.I am reading the codebase little by little. Please suggest improvements on the following topics,

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 12:41:31PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase

Re: [PATCH v3] tests: use env to run commands with temporary env-var settings

2014-03-19 Thread Junio C Hamano
David Tran unsignedz...@gmail.com writes: Originally, we would use VAR=VAL command to execute a test command with environment variable(s) only for that command. This does not work for commands that are shell functions (most notably test functions like test_must_fail); the result of the

Re: What's cooking in git.git (Mar 2014, #03; Fri, 14)

2014-03-19 Thread Junio C Hamano
Max Horn m...@quendi.de writes: On 17.03.2014, at 18:01, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-03-14 23.09, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit - remote-hg: do not fail on invalid bookmarks

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Junio C Hamano
sza...@chromium.org writes: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit position pointer of the

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I thought your suggestion was: 'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say 'Fast-forwarded HEAD to 4f407407 (rebase: allow - short-hand for the previous branch, 2014-03-19)' instead. Or it could be: 'rebase

Re: Rebasing merge commits

2014-03-19 Thread Max Kirillov
On Tue, Mar 18, 2014 at 01:11:06PM -0500, Robert Dailey wrote: What's the general recommendation on rebasing after creating a merge commit on my branch? Basically, rebase does not do anything magic. It just cherry-picks commits over a custom revision. You could do it manually: reset to the

Re: [PATCH v2 1/3][GSOC] diff: rename read_directory() to get_path_list()

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 7:23 AM, Hiroyuki Sano sh19910...@gmail.com wrote: Subject: diff: rename read_directory() to get_path_list() You probably mean 'diff-no-index' here rather than 'diff'. Including dir.h in diff-no-index.c, it causes a compile error, because the same name function

Re: [PATCH v2 2/3][GSOC] diff: use is_dot_or_dotdot() instead of strcmp()

2014-03-19 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 7:23 AM, Hiroyuki Sano sh19910...@gmail.com wrote: Subject: diff: use is_dot_or_dotdot() instead of strcmp() You probably meant 'diff-no-index' rather than 'diff'. You could make the subject a bit more explanatory by saying: use is_dot_or_dotdot() instead of a

Re: [PATCH] t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

2014-03-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Hi Sebastian, On Wed, 19 Mar 2014, Sebastian Schuberth wrote: On MINGW, pwd is defined as pwd -W in test-lib.sh. This usually is the right thing, but the absolute Windows path with a colon confuses rsync. We could use $PWD in this case

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Is that a good argument? Wouldn't the default of 128MiB burden smaller machines with bloated processes? Forgot

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Is that a good argument? Wouldn't the default of 128MiB burden

[PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Stefan Zager
This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit position pointer of the descriptor. Experiments have shown that

Re: [RFC][GSoC] Calling for comments regarding rough draft of proposal

2014-03-19 Thread Junio C Hamano
tanay abhra tanay...@gmail.com writes: 2.Other things I should add to the proposal that I have left off?I am getting confused what extra details I should add to the proposal. I will add the informal parts(my background, schedule for summer etc) of the proposal later. I would not label the

[PATCH v2] remote-hg: do not fail on invalid bookmarks

2014-03-19 Thread Max Horn
Mercurial can have bookmarks pointing to nullid (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import will fail because git-remote-hg will not be able to create the corresponding reference.

Re: [PATCH] t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

2014-03-19 Thread Johannes Schindelin
Hi Sebastian, On Wed, 19 Mar 2014, Sebastian Schuberth wrote: On MINGW, pwd is defined as pwd -W in test-lib.sh. This usually is the right thing, but the absolute Windows path with a colon confuses rsync. We could use $PWD in this case to work around the issue, but in fact there is no need

Re: [PATCH v2] remote-hg: do not fail on invalid bookmarks

2014-03-19 Thread Junio C Hamano
Max Horn m...@quendi.de writes: Mercurial can have bookmarks pointing to nullid (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import will fail because git-remote-hg will not be able to

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Signed-off-by: David Kastrup d...@gnu.org --- Is that a good argument?

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Junio C Hamano
sza...@chromium.org (Stefan Zager) writes: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect the implicit position pointer

Re: [PATCH 0/3] Make git more user-friendly during a merge conflict

2014-03-19 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano gits...@pobox.com wrote: Has this series been tested with existing test suite? ... I tested it during RFC, but missed it when I sent it as patch. ... I'll fix the problem. Sorry about that. Thanks.

Re: [BUG] Segfault on git describe

2014-03-19 Thread Dragos Foianu
Sylvestre Ledru sylvestre at mozilla.com writes: Hello, Trying to do some stats using the Firefox git repository (https://github.com/mozilla/gecko-dev), I found a bug on git describe. The following command will segfault: git describe --contains a9ff31aebd6dbda82a3c733a72eeeaa0b0525b96

Re: [PATCH] disable grafts during fetch/push/bundle

2014-03-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 07, 2014 at 08:08:37AM +0100, Christian Couder wrote: Be it graft or replace, I do not think we want to invite people to use these mechansims too lightly to locally rewrite their history willy-nilly without fixing their mistakes at the object

[PATCH v3][GSOC] fsck: use bitwise-or assignment operator to set flag

2014-03-19 Thread Hiroyuki Sano
fsck_tree() has two different ways to set a flag, which are the followings: 1. Using a if-statement that guards assignment. 2. Using a bitwise-or assignment operator. Currently, many with the former way, and one with the latter way. In this patch, unify them to the latter way, because it

Re: [PATCHv2] branch.c: simplify chain of if statements

2014-03-19 Thread Dragos Foianu
Eric Sunshine sunshine at sunshineco.com writes: Other submissions have computed this value mathematically without need for conditionals. For instance, we've seen: index = (!!origin 0) + (!!remote_is_branch 1) + (!!rebasing 2) as, well as the equivalent: index = !!origin +

[PATCH] diff: optimise parse_dirstat_params() to only compare strings when necessary

2014-03-19 Thread Dragos Foianu
parse_dirstat_params() goes through a chain of if statements using strcmp to parse parameters. When the parameter is a digit, the value must go through all comparisons before the function realises it is a digit. Optimise this logic by only going through the chain of string compares when the

git 1.9.1 tarball

2014-03-19 Thread 乙酸鋰
Hi, Where to find git 1.9.1 tarball? It is not uploaded to google code. -- 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] diff: optimise parse_dirstat_params() to only compare strings when necessary

2014-03-19 Thread Dragos Foianu
I will send another version of this patch after review because there is an extra whitespace following the else statement. -- 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

Re: [PATCH] test-lib.sh: use printf instead of echo

2014-03-19 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: We currently use echo all over the place (e.g., 'echo $path' in git-sh-setup), and every time we fix it there is a chance of making mistakes. I wonder if it would make sense to add a helper to make the echo calls easier to

Re: [PATCH] Enable index-pack threading in msysgit.

2014-03-19 Thread Duy Nguyen
On Thu, Mar 20, 2014 at 4:35 AM, Stefan Zager sza...@chromium.org wrote: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. According to the ReadFile spec, using the 'overlapped' argument should not affect

Re: [PATCH 4/4] gc --aggressive: three phase repacking

2014-03-19 Thread Duy Nguyen
On Wed, Mar 19, 2014 at 9:14 PM, Stefan Beller stefanbel...@gmail.com wrote: Maybe we should introduce another option --pack-for-archive which features the characteristics of the old --aggressive. And the new --aggressive would be a tradeoff between space and time? Thinking further we could

Re: [PATCH v2] Bump core.deltaBaseCacheLimit to 128MiB

2014-03-19 Thread Duy Nguyen
On Thu, Mar 20, 2014 at 5:11 AM, Junio C Hamano gits...@pobox.com wrote: David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: David Kastrup d...@gnu.org writes: The default of 16MiB causes serious thrashing for large delta chains combined with large files.

[PATCH] builtin/apply.c: fuzzy_matchlines:trying to fix some inefficiencies

2014-03-19 Thread George Papanikolaou
Hi fellows, I'm planning on applying on GSOC 2014... I tried my luck with that kinda weird microproject about inefficiencies, and I think I've discovered some. (also on a totally different mood, there are some warning about empty format strings during compilation that could easily be silenced

  1   2   >