Re: git 1.9.1 tarball

2014-03-20 Thread Junio C Hamano
Jason St. John jstj...@purdue.edu writes: On Wed, Mar 19, 2014 at 8:09 PM, 乙酸鋰 ch3co...@gmail.com wrote: Hi, Where to find git 1.9.1 tarball? It is not uploaded to google code. -- You can download a tarball for 1.9.1 from GitHub: https://github.com/git/git/archive/v1.9.1.tar.gz Jason

[GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Yao Zhao
Hello, Michael, Matthieu and peff, My name is Yao and I am interested in Git Configuration API Improvements listed in idea page in Git. I came up some ideas and really want to discuss them with you. First is about when to start reading configuration file to cache. My idea is the time user

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

2014-03-20 Thread Ilya Bobyr
On 3/19/2014 11:46 AM, Junio C Hamano wrote: 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

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

2014-03-20 Thread Ilya Bobyr
Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after the argument name up to the first whitespace. Underscores are replaced with

Re: [GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Michael Haggerty
On 03/20/2014 08:23 AM, Yao Zhao wrote: Third one is about when to write back to file, I am really confused about it. I think one way could be when user leave git repository using cd to go back. But I am not sure if git could detect user calls cd to leave repository. I don't understand. The

Re: [GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Matthieu Moy
Hi, Yao Zhao zhaox...@umn.edu writes: First is about when to start reading configuration file to cache. My idea is the time user starts call command that need configuration information (need to read configuration file). I'd actually load the configuration lazily, when Git first requires a

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

2014-03-20 Thread George Papanikolaou
Hi again guys, I forgot to add the signed-of line to the tiny patch I sent earlier for GSOC. Any ideas about the changes? Thanks... Signed-off-by: George Papanikolaou g3orge@gmail.com --- builtin/apply.c | 25 + 1 file changed, 9 insertions(+), 16 deletions(-) diff

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

2014-03-20 Thread Michael Haggerty
Hello and welcome. See the comments inline. On 03/20/2014 02:32 AM, George Papanikolaou wrote: 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

[PATCH] Rewritten fetch-pack.c:filter_refs() using starts_with() instead of memcmp()

2014-03-20 Thread MustafaOrkunAcar
Hi, I have completed one of the microprojects -14th one: Change fetch-pack.c:filter_refs() to use starts_with() instead of memcmp(). The only line in the function filter_refs() containing memcmp() is changed with starts_with(). I plan to apply for GSoC 2014. Any feedback is appreciated.

[PATCH/RFC 0/8] git-ls

2014-03-20 Thread Nguyễn Thái Ngọc Duy
Last time I tried this was more than two years ago [1]. It's time for another try and see if the community has any interest in it. The command is straight forward, it's a ls-like version for listing things in git. It respects $LS_COLORS and does column output like GNU ls. ls shows cached entries

[PATCH 1/8] Import $LS_COLORS parsing code from coreutils

2014-03-20 Thread Nguyễn Thái Ngọc Duy
This could could help highlight files in ls-files or status output, or even diff --name-only (but that's questionable). This code is from coreutils.git commit 7326d1f1a67edf21947ae98194f98c38b6e9e527 file src/ls.c. This is the last GPL-2 commit before coreutils turns to GPL-3. The code is

[PATCH 2/8] ls_colors.c: a bit of document on print_color_indicator input

2014-03-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- ls_colors.c | 5 + 1 file changed, 5 insertions(+) diff --git a/ls_colors.c b/ls_colors.c index 6385446..d492ab3 100644 --- a/ls_colors.c +++ b/ls_colors.c @@ -401,6 +401,11 @@ static void put_indicator(const struct bin_str *ind)

[PATCH 3/8] ls_colors.c: enable coloring on u+x files

2014-03-20 Thread Nguyễn Thái Ngọc Duy
git-compat-util.h does not seem to carry S_IXUGO. Anyway as far as Git is concerned, we only care one executable bit. Hard code it. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- ls_colors.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ls_colors.c

[PATCH 4/8] ls_colors.c: new color descriptors

2014-03-20 Thread Nguyễn Thái Ngọc Duy
After coreutils moved to GPL-3 a couple more color descriptors were added. parse_ls_color() will abort if it finds any of these so just add them recognized (but never actually use them). Reference commits (in coreutils.git) 0df338f (ls --color: do not colorize files with multiple hard links by

[PATCH 8/8] Add git-ls, a user friendly version of ls-files and more

2014-03-20 Thread Nguyễn Thái Ngọc Duy
For now it's simply a wrapper of ls-files with some default goodies. But I want it to be the UI for ls-tree and perhaps git diff --name-only [--cached] too. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin.h | 1 + builtin/ls-files.c | 19 +++ git.c

[PATCH 5/8] ls-files: add --color to highlight based on $LS_COLORS

2014-03-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-files.c | 38 -- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 47c3880..463280e 100644 --- a/builtin/ls-files.c +++

[PATCH 6/8] ls-files: add --column

2014-03-20 Thread Nguyễn Thái Ngọc Duy
Default pathspec behavior is recursive which includes too many files for effective column output. But if you can do git ls-files --column ':(glob)*' to limit to one level only. It's not exactly the same as GNU ls (e.g. directories are never shown) but much closer. Signed-off-by: Nguyễn Thái

[PATCH 7/8] ls-files: support --max-depth

2014-03-20 Thread Nguyễn Thái Ngọc Duy
The use case in mind is --max-depth=0 to stop recursion. With this we can do git config --global alias.ls 'ls-files --column --color --max-depth=0' and have git ls with an output very similar to GNU ls. Another interesting one is git config --global alias.lso 'ls-files --column --color

Bug? git status --porcelain --branch is translated

2014-03-20 Thread Anarky
Hello, The porcelain format of git status is described as not based on user configuration. But with --branch, behind/ahead are translated following the user's locale. Is it normal that scripts need to take care of that? Thanks. -- To unsubscribe from this list: send the line unsubscribe git in

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

2014-03-20 Thread George Papanikolaou
Hi, Thanks for the feedback, On Thu, Mar 20, 2014 at 11:58 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Why is this an improvement? Do you expect this function to be called often for empty lines (as opposed, for example, to lines consisting solely of whitespace characters)? Yes, you

Re: [PATCH 3/8] ls_colors.c: enable coloring on u+x files

2014-03-20 Thread Matthieu Moy
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: git-compat-util.h does not seem to carry S_IXUGO. Anyway as far as Git is concerned, we only care one executable bit. Hard code it. Why not use S_IXUSR instead of a hardcoded value? (already used in path.c, so shouldn't be a problem wrt

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

2014-03-20 Thread Aleksey Mokhovikov
On 03/19/2014 04:21 PM, Eric Sunshine wrote: 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()

Re: [PATCH 8/8] Add git-ls, a user friendly version of ls-files and more

2014-03-20 Thread Matthieu Moy
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: +int cmd_ls(int argc, const char **argv, const char *cmd_prefix) +{ + struct argv_array av = ARGV_ARRAY_INIT; + argv_array_pushl(av, ls-files, + --color, --column, --max-depth=0, +

Re: [BUG] Segfault on git describe

2014-03-20 Thread Sylvestre Ledru
Sylvestre Ledru sylvestre at mozilla.com writes: As attachment, the backtrace. I removed about 87250 calls to the name_rev function. I guess that is a potential source of problem. FYI, ulimit -s 10 (increase the stack size) fixes the issue. Sylvestre -- To unsubscribe from this list:

[PATCH] status: disable translation when --porcelain is used

2014-03-20 Thread Matthieu Moy
git status --branch --porcelain displays the status of the branch (ahead, behind, gone), and used gettext to translate the string. Use hardcoded strings when --porcelain is used, but keep the gettext translation for git status --short which is essentially the same, but meant to be read by a

Re: [PATCH 3/8] ls_colors.c: enable coloring on u+x files

2014-03-20 Thread Duy Nguyen
On Thu, Mar 20, 2014 at 6:46 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: git-compat-util.h does not seem to carry S_IXUGO. Anyway as far as Git is concerned, we only care one executable bit. Hard code it. Why not use S_IXUSR instead of

Re: Configuring a third-party git hook

2014-03-20 Thread Kevin
On Wed, Mar 19, 2014 at 12:16 PM, Chris Angelico ros...@gmail.com wrote: Two parts to the question, then. Firstly, is it acceptable to use 'git config' for a hook like this? And secondly, either: Is there a naming convention to follow? or, what alternative would you recommend? 1. I would say

[PATCH v3] Documentation/gitk: Document new config file location

2014-03-20 Thread Astril Hayato
User config file location now complies with the XDG base directory specification Signed-off-by: Astril Hayato astrilhay...@gmail.com --- Documentation/gitk.txt | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index

Re: GSoC proposal: port pack bitmap support to libgit2.

2014-03-20 Thread Yuxuan Shui
Hi, Sorry for this late reply, I was busy for past few days. On Fri, Mar 14, 2014 at 12:34 PM, Jeff King p...@peff.net wrote: On Wed, Mar 12, 2014 at 04:19:23PM +0800, Yuxuan Shui wrote: I'm Yuxuan Shui, a undergraduate student from China. I'm applying for GSoC 2014, and here is my proposal:

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

2014-03-20 Thread Karsten Blees
Am 19.03.2014 01:46, schrieb sza...@chromium.org: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. This is a bad idea. You're basically fixing the multi-threaded issue twice, while at the same time breaking

Loan Offer Company

2014-03-20 Thread finance06
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

[GSoC 2014] Replacing object loading/writing layer by libgit2

2014-03-20 Thread Guanglin Xu
Hello, My name is Guanglin Xu. I am a second-year master student at Sun Yat-sen University in China, majoring in Software Engineering. I am also a perspective PhD student matriculated in the US. I'm planning on doing summer projects which I can work remotely. The GSoC 2014 program of Git project

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

2014-03-20 Thread Stefan Zager
On Thu, Mar 20, 2014 at 6:54 AM, Karsten Blees karsten.bl...@gmail.com wrote: Am 19.03.2014 01:46, schrieb sza...@chromium.org: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a file descriptor. This is a bad idea. You're

[RFC][GSOC] Proposal Draft for GSoC, Suggest Changes

2014-03-20 Thread karthik nayak
Hello, I have completed my microproject under the guidance of Eric, After going through the code and previous mailing lists. I have drafted my Proposal. Still going through the code as of now and figuring things out. Would be great to have your suggestions on my proposal, so that i can improve it

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

2014-03-20 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: ... I am a bit reluctant to name the helper sane_echo to declare echo that interprets backslashes in the string is insane, though. For these print a single line uses, we are only interested in using a subset of the features

Re: Configuring a third-party git hook

2014-03-20 Thread Chris Angelico
On Thu, Mar 20, 2014 at 11:53 PM, Kevin i...@ikke.info wrote: On Wed, Mar 19, 2014 at 12:16 PM, Chris Angelico ros...@gmail.com wrote: Two parts to the question, then. Firstly, is it acceptable to use 'git config' for a hook like this? And secondly, either: Is there a naming convention to

Re: Configuring a third-party git hook

2014-03-20 Thread Junio C Hamano
Chris Angelico ros...@gmail.com writes: file. It doesn't really care about the full history, and wants to be reasonably fast (as the user is waiting for it). It's just a convenience, so correctness isn't a huge issue. The easiest way to keep it moving through quickly is to limit the search:

Re: [PATCH 03/26] t1400: Pass a legitimate newvalue to update command

2014-03-20 Thread Michael Haggerty
On 03/11/2014 10:41 PM, Brad King wrote: On Tue, Mar 11, 2014 at 4:06 PM, Junio C Hamano gits...@pobox.com wrote: I may be misremembering things, but your first sentence quoted above was exactly my reaction while reviewing the original change, and I might have even raised that as an issue

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

2014-03-20 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Mar 20, 2014 at 5:11 AM, Junio C Hamano gits...@pobox.com wrote: ... I know that the 512MiB default for the bitFileThreashold (aka forget about delta compression) came out of thin air. It was just 1GB is always too huge for anybody, so let's cut

Re: Configuring a third-party git hook

2014-03-20 Thread Chris Angelico
On Fri, Mar 21, 2014 at 3:53 AM, Junio C Hamano gits...@pobox.com wrote: Chris Angelico ros...@gmail.com writes: file. It doesn't really care about the full history, and wants to be reasonably fast (as the user is waiting for it). It's just a convenience, so correctness isn't a huge issue.

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

2014-03-20 Thread Junio C Hamano
Dragos Foianu dragos.foi...@gmail.com writes: 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

[GSoC] Inquiry about writing config file to disk

2014-03-20 Thread Tanay Abhra
Hi, I have gone through commit.c, builtin/commit.c and api-config.txt but one thing I cannot find is which functions handle writing config file to disk after adding a new variable,value pair(for example git config my.option true) . It is also marked TODO on the api-config.txt file. Can somebody

Re: [GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Why? (In general, explaining why you chose something is more important than explaining what you chose) Good educational comment. Thanks. A tree (AST, Abstract syntax tree) can be interesting if you have some source-to-source

Re: [PATCH 3/8] ls_colors.c: enable coloring on u+x files

2014-03-20 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Mar 20, 2014 at 6:46 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: git-compat-util.h does not seem to carry S_IXUGO. Anyway as far as Git is concerned, we only care one executable bit. Hard

Re: [PATCH] status: disable translation when --porcelain is used

2014-03-20 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: git status --branch --porcelain displays the status of the branch (ahead, behind, gone), and used gettext to translate the string. Use hardcoded strings when --porcelain is used, but keep the gettext translation for git status --short which is

Re: [PATCH v3] Documentation/gitk: Document new config file location

2014-03-20 Thread Junio C Hamano
Astril Hayato astrilhay...@gmail.com writes: User config file location now complies with the XDG base directory specification Signed-off-by: Astril Hayato astrilhay...@gmail.com --- Documentation/gitk.txt | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git

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

2014-03-20 Thread Junio C Hamano
Hiroyuki Sano sh19910...@gmail.com writes: 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

[RFC] [GSoC] Draft of Proposal for GSoC

2014-03-20 Thread Brian Bourn
Hi all, This is a first draft of my Proposal for GSoC, I'd love feedback about what I might be missing and any other files I should read regarding this, so far I have read most of tag.c, branch.c, builtin/for-each-ref.c, parse-options.c. once again I hope I can get the same amount of helpful

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

2014-03-20 Thread Junio C Hamano
Ilya Bobyr ilya.bo...@gmail.com writes: Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after the argument name up to the

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

2014-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: In other words, it is brief and to the point merely _allows_ these statements to be expressed in the latter form; it does not say anything about which is better between the former and the latter. In any case, that is a minor point. I'll queue the

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

2014-03-20 Thread David Tran
Ordinarily, we would say VAR=VAL command to execute a tested command with environment variable(s) set only for that command. This however does not work if 'command' is a shell function (most notably 'test_must_fail'); the result of the assignment is retained and affects later commands. To avoid

Re: [PATCH v3 2/2] log: add --show-linear-break to help see non-linear history

2014-03-20 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Option explanation is in rev-list-options.txt. The interaction with -z is left undecided. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Thanks. * Revert back to the old option name --show-linear-break * Get rid of

Re: [PATCH 1/8] Import $LS_COLORS parsing code from coreutils

2014-03-20 Thread David Tran
Nguyễn Thái Ngọc Duy pclouds at gmail.com writes: This could could help highlight files in ls-files or status output, or even diff --name-only (but that's questionable). This code is from coreutils.git commit 7326d1f1a67edf21947ae98194f98c38b6e9e527 file src/ls.c. This is the last GPL-2

[PATCH] builtin/apply.c: use iswspace() to detect line-ending-like chars

2014-03-20 Thread George Papanikolaou
Removing the bloat of checking for both '\r' and '\n' with the prettier iswspace() function which checks for other characters as well. (read: \f \t \v) --- This is one more try to clean up this fuzzy_matchlines() function as part of a microproject for GSOC. The rest more clarrified microprojects

Re: Lost commit during rebase!

2014-03-20 Thread Robert Dailey
Sorry it looks like I missed some basic documentation: http://git-scm.com/docs/git-rebase This issue (combining preserve merges with interactive option) is described in the BUGS section. Is there a way I can go about this without losing my merge commits? On Thu, Mar 20, 2014 at 2:37 PM, Robert

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

2014-03-20 Thread Andrei Dinu
Avoid the conflict between read_directory() from diff-no-index.c and read_directory() from dir.h Signed-off-by: Andrei Dinu mandrei.d...@gmail.com --- I plan on applying to GSOC 2014 Submit again on the list for an older bug that I solved, to show you that I received your feedback and I

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

2014-03-20 Thread Eric Sunshine
On Thu, Mar 20, 2014 at 4:44 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after

[PATCH] Make XDF_NEED_MINIMAL default in blame.

2014-03-20 Thread Michael Andreen
Currently git blame has a big problem finding copies and moves when you split up a big file into smaller ones. One example in the git repository is 2cf565c, which split the documentation into smaller files. In 582aa00 XDF_NEED_MINIMAL was removed as the default for performance reasons, mainly for

Re: [PATCH] Make XDF_NEED_MINIMAL default in blame.

2014-03-20 Thread Junio C Hamano
Michael Andreen h...@ruin.nu writes: There hasn't been any arguments against this patch. Just updated the message with a note about --no-minimal. There hasn't been any argument for this patch, either. It is not like we are still in year 2007; timing result in a small project like Git itself

What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 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'. More topics merged to 'master', some of which have been cooking before the v1.9.0 final release, many of them fallouts from GSoC microprojects.

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

2014-03-20 Thread Junio C Hamano
Дилян Палаузов dilyan.palau...@aegee.org writes: diff --git a/Makefile b/Makefile index dddaf4f..dce4694 100644 --- a/Makefile +++ b/Makefile @@ -59,9 +59,9 @@ all:: # FreeBSD can use either, but MinGW and some others need to use # libcharset.h's locale_charset() instead. # -# Define

Re: Re: [GSOC 2014]idea:Git Configuration API Improvement

2014-03-20 Thread Yao Zhao
I think I misunderstand the project as Moy said. I thought the purpose of project is to store configuration into memory between multiple git calls. Sorry. Moy, thanks for explaining. You said API should be hided. Is that means I should indicate an arbitary feature in old version or new feature

Re: [PATCH] Make XDF_NEED_MINIMAL default in blame.

2014-03-20 Thread Michael Andreen
On Thursday, March 20, 2014 01:45:21 PM Junio C Hamano wrote: There hasn't been any argument for this patch, either. It is not like we are still in year 2007; timing result in a small project like Git itself is not a good enough argument to change a well established default at this late in

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

2014-03-20 Thread David Kastrup
Junio C Hamano gits...@pobox.com writes: Duy Nguyen pclo...@gmail.com writes: The only downside I see is large blobs will be packed undeltified, which could increase pack size if you have lots of them. I think that is something that can be tweaked, unless the user tells us otherwise via

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

2014-03-20 Thread Karsten Blees
Am 20.03.2014 17:08, schrieb Stefan Zager: On Thu, Mar 20, 2014 at 6:54 AM, Karsten Blees karsten.bl...@gmail.com wrote: Am 19.03.2014 01:46, schrieb sza...@chromium.org: This adds a Windows implementation of pread. Note that it is NOT safe to intersperse calls to read() and pread() on a

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

2014-03-20 Thread Stefan Zager
On Thu, Mar 20, 2014 at 2:35 PM, Karsten Blees karsten.bl...@gmail.com wrote: Am 20.03.2014 17:08, schrieb Stefan Zager: Going forward, there is still a lot of performance that gets left on the table when you rule out threaded file access. There are not so many calls to read, mmap, and pread

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 Thread Torsten Bögershausen
On 03/20/2014 10:09 PM, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit - remote-hg: do not fail on invalid bookmarks Will merge to 'next'. Hmm, am I the only one who has 11 failures in test-hg-hg-git.sh, like this: (Tested under Debian 7, commit

[PATCH 1/4] Documentation: Fix misuses of nor

2014-03-20 Thread Justin Lebar
Signed-off-by: Justin Lebar jle...@google.com --- Documentation/CodingGuidelines | 4 ++-- Documentation/config.txt| 6 +++--- Documentation/diff-generate-patch.txt | 2 +- Documentation/diff-options.txt | 2

[PATCH 3/4] Fix misuses of nor in comments

2014-03-20 Thread Justin Lebar
Signed-off-by: Justin Lebar jle...@gmail.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c | 2 +- builtin/pack-objects.c

[PATCH 2/4] contrib: Fix misuses of nor

2014-03-20 Thread Justin Lebar
Signed-off-by: Justin Lebar jle...@google.com --- contrib/examples/git-commit.sh | 2 +- contrib/svn-fe/svn-fe.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh index 23ffb02..4aab1a6 100755 ---

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Quite a few topics are still outside 'pu' and I suspect some of the larger ones deserve deeper reviews to help moving them to 'next'. In principle, I'd prefer to keep any large topic that touch core part of the system cooking in 'next' for at least a

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

2014-03-20 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: Duy Nguyen pclo...@gmail.com writes: The only downside I see is large blobs will be packed undeltified, which could increase pack size if you have lots of them. I think that is something that can be tweaked,

Re: What's cooking in git.git (Mar 2014, #04; Thu, 20)

2014-03-20 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 03/20/2014 10:09 PM, Junio C Hamano wrote: * ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit - remote-hg: do not fail on invalid bookmarks Will merge to 'next'. Hmm, am I the only one who has 11 failures in test-hg-hg-git.sh, Still?

Re: [PATCH 3/4] Fix misuses of nor in comments

2014-03-20 Thread Jason St. John
On Thu, Mar 20, 2014 at 6:16 PM, Justin Lebar jle...@google.com wrote: Signed-off-by: Justin Lebar jle...@gmail.com --- Makefile| 2 +- builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/log.c

[PATCH 0/4] Fix misuses of nor (v2)

2014-03-20 Thread Justin Lebar
I got annoyed by git's awkward use of nor in man pages and in git add -p, so I went ahead and audited all uses of nor in the tree. One might be able to argue that some of the uses I've changed are technically acceptable, but that's a pretty low bar to set for ourselves. I aimed to make

[PATCH 4/4] Fix misuses of nor outside comments and in tests

2014-03-20 Thread Justin Lebar
Signed-off-by: Justin Lebar jle...@gmail.com --- builtin/clean.c | 6 +++--- builtin/commit.c | 2 +- git-add--interactive.perl | 4 ++-- perl/Git/SVN.pm | 4 ++-- sha1_file.c | 2 +- t/t1001-read-tree-m-2way.sh

Re: git log omits deleting merges

2014-03-20 Thread Philip Oakley
From: Jeff King p...@peff.net On Thu, Feb 20, 2014 at 08:35:33AM +0100, Ephrim Khong wrote: Hi, git log seems to omit merge commits that delete a file if --follow or --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired behaviour for --diff-filter=D, but it's probably

[PATCH 0/12] GIT_CONFIG in the test suite

2014-03-20 Thread Jeff King
On Wed, Mar 19, 2014 at 10:28:46AM -0700, Junio C Hamano wrote: [git config --file versus GIT_CONFIG=] Thanks. Then I think it makes sense to do such a conversion but it probably should be done on top of this patch (we could do it before this patch), not as a part of this patch. Here's a

[PATCH 01/12] t/Makefile: stop setting GIT_CONFIG

2014-03-20 Thread Jeff King
Once upon a time, the setting of GIT_CONFIG in the environment could affect how tests ran. Commit 9c3796f (Fix setting config variables with an alternative GIT_CONFIG, 2006-06-20) unconditionally set GIT_CONFIG in the Makefile when running tests to give us a known starting point. This is

Re: [PATCH 3/4] Fix misuses of nor in comments

2014-03-20 Thread Justin Lebar
Thanks for the quick reply. When I send a new patch, should I fold these changes into the original commit, or should I send them as a separate commit? diff --git a/builtin/apply.c b/builtin/apply.c index b0d0986..6013e19 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4061,7 +4061,7

[PATCH 02/12] t/test-lib: drop redundant unset of GIT_CONFIG

2014-03-20 Thread Jeff King
This is already handled by the mass GIT_* unsetting added by 95a1d12 (tests: scrub environment of GIT_* variables, 2011-03-15). Signed-off-by: Jeff King p...@peff.net --- t/test-lib.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 1531c24..625f06e 100644

[PATCH 03/12] t: drop useless sane_unset GIT_* calls

2014-03-20 Thread Jeff King
Several test scripts manually unset GIT_CONFIG and other GIT_* variables. These are generally taken care of for us by test-lib.sh already. Unsetting these is not only useless, but can be confusing to a reader, who may wonder why some tests in a script unset them and others do not (t0001 is

[PATCH 05/12] t: prefer git config --file to GIT_CONFIG with test_must_fail

2014-03-20 Thread Jeff King
This lets us get rid of an extra env invocation in the middle, and is slightly more readable. Signed-off-by: Jeff King p...@peff.net --- The case that started this all... This is also the only reason this series needs to go on top of David's patch. t/t1300-repo-config.sh | 8 1 file

[PATCH 06/12] t: prefer git config --file to GIT_CONFIG

2014-03-20 Thread Jeff King
Doing: GIT_CONFIG=foo git config ... is equivalent to: git config --file=foo ... The latter is easier to read and slightly less error-prone, because of issues with one-shot variables and shell functions (e.g., you cannot use the former with test_must_fail). Note that we explicitly leave

[PATCH 08/12] t0001: use test_path_is_*

2014-03-20 Thread Jeff King
t0001 predates the test_path_is_* helpers, and uses test -f and test -d directly. Using the helpers provides better debugging output, and are a little more robust. As opposed to ! test -d, test_path_is_missing will actually makes sure the path does not exist at all. Signed-off-by: Jeff King

[PATCH 07/12] t0001: make symlink reinit test more careful

2014-03-20 Thread Jeff King
In the final test of t0001, we have a repo whose .git is a symlink to a directory here, and we use --separate-git-dir to migrate that to a .git file pointing to a different directory. We check that the data is migrated to the new directory and that .git looks like a git-file. We also check that

[PATCH 09/12] t0001: use test_config_global

2014-03-20 Thread Jeff King
We hand-set several config options using : git config -f $HOME/.gitconfig ... Instead, we can use test_config_global. Not only is this more readable, but it cleans up for us so that subsequent tests aren't polluted by our settings. Signed-off-by: Jeff King p...@peff.net --- t/t0001-init.sh |

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

2014-03-20 Thread Ilya Bobyr
On 3/20/2014 11:38 AM, Junio C Hamano wrote: Ilya Bobyr ilya.bo...@gmail.com writes: Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after

[PATCH 10/12] t0001: use test_must_fail

2014-03-20 Thread Jeff King
We've hand-rolled several if statements looking for failures. We can use test_must_fail here, which is shorter and more robust. Note that we modify the commands slightly (to use git init foo rather than cd foo git init) to avoid dealing with a subshell, but this should not affect the outcome.

[PATCH 11/12] t0001: drop useless subshells

2014-03-20 Thread Jeff King
Many tests use subshells, but don't actually change the shell environment. They were probably cargo-culted from earlier tests which did need subshells. Drop the useless ones. Signed-off-by: Jeff King p...@peff.net --- These ones should produce no behavior change at all; they're purely mechanical

[PATCH 12/12] t0001: drop subshells just for cd

2014-03-20 Thread Jeff King
Many tests do something like: ( mkdir foo cd foo git init ) You can do the same these days with git init foo, which makes the tests shorter and simpler to read. Signed-off-by: Jeff King p...@peff.net --- Unlike the last patch, this one _could_ have an affect. I

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

2014-03-20 Thread Hiroyuki
Junio and Eric, Thank you for the reviews and helpful advice. I should have read more past commit messages before send patch. Regards, 2014-03-21 3:20 GMT+09:00 Junio C Hamano gits...@pobox.com: Hiroyuki Sano sh19910...@gmail.com writes: fsck_tree() has two different ways to set a flag,

Re: [BUG] Segfault on git describe

2014-03-20 Thread Jeff King
On Wed, Mar 19, 2014 at 10:34:29PM +, Dragos Foianu wrote: The name_rev function recursively calls itself which is why the backtrace is so big. Unfortunately, for repos with long histories it can lead to Stack Overflows. This is pretty much what happened in your case. I tested it on my

Re: Configuring a third-party git hook

2014-03-20 Thread Jeff King
On Fri, Mar 21, 2014 at 03:51:16AM +1100, Chris Angelico wrote: 1. I would say yes. git config is made to be extended and doesn't require a config item to be known. 2. Namespacing the config items like you did is a good thing to do so it won't interfere with other options. Excellent!

Re: Configuring a third-party git hook

2014-03-20 Thread Chris Angelico
On Fri, Mar 21, 2014 at 10:38 AM, Jeff King p...@peff.net wrote: A comment there to the effect that Third party tools may also define their own variables or something would make it clear that this is the intention. I think this sentence from the section you linked is meant to express that:

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

2014-03-20 Thread Jeff King
On Wed, Mar 19, 2014 at 01:38:32PM +0100, David Kastrup wrote: The default of 16MiB causes serious thrashing for large delta chains combined with large files. Does it make much sense to bump this without also bumping MAX_DELTA_CACHE in sha1_file.c? In my measurements of linux.git, bumping the

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

2014-03-20 Thread Eric Sunshine
On Thu, Mar 20, 2014 at 3:52 PM, Andrei Dinu mandrei.d...@gmail.com wrote: Avoid the conflict between read_directory() from diff-no-index.c and read_directory() from dir.h This message is lacking a bit of information. Since diff-no-index.c does not presently include dir.h, the reader is left to

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

2014-03-20 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 9:44 AM, Othman Darraz darraz...@gmail.com wrote: Subject: fsck.c:fsck_commit() use skip_prefix() and starts_with() Add a space after the colon. Add a colon after fsck_commit(). make buffer const char* because the content of the memory referenced by this variable

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

2014-03-20 Thread Eric Sunshine
On Wed, Mar 19, 2014 at 7:12 PM, Dragos Foianu dragos.foi...@gmail.com wrote: Eric Sunshine sunshine at sunshineco.com writes: On Tue, Mar 18, 2014 at 6:31 PM, Eric Sunshine sunshine at sunshineco.com wrote: One other observation: You have a one-off error in your out-of-bounds check. It

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

2014-03-20 Thread Eric Sunshine
On Thu, Mar 20, 2014 at 8:40 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Mar 19, 2014 at 7:12 PM, Dragos Foianu dragos.foi...@gmail.com wrote: Eric Sunshine sunshine at sunshineco.com writes: On Tue, Mar 18, 2014 at 6:31 PM, Eric Sunshine sunshine at sunshineco.com wrote: One

  1   2   >