Re: [PATCH 03/10] t4018: an infrastructure to test hunk headers

2014-03-21 Thread Johannes Sixt
Am 21.03.2014 23:00, schrieb Junio C Hamano: > Johannes Sixt writes: > >> Add an infrastructure that simplifies adding new tests of the hunk >> header regular expressions. >> >> To add new tests, a file with the syntax to test can be dropped in the >> directory t4018. The README file explains how

with reuse-delta patches, fetching with bitmaps segfaults due to possibly incomplete bitmap traverse

2014-03-21 Thread Siddharth Agarwal
Hi all, At Facebook we've found that fetch speed is a bottleneck for our Git repos, so we've been looking to deploy bitmaps to speed up fetches. We've been trying out git-next with the top two patches from https://github.com/peff/git/commits/jk/bitmap-reuse-delta, but the following is reprodu

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

2014-03-21 Thread Eric Sunshine
[Please reply on-list to review comments. Other people may learn from the discussion or have comments of their own.] On Fri, Mar 21, 2014 at 6:00 PM, George Papanikolaou wrote: > On Fri, Mar 21, 2014 at 4:48 AM, Eric Sunshine > wrote: >> >> Did you verify that it is safe to strip all whitespace

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

2014-03-21 Thread Junio C Hamano
Max Horn writes: > Hi Torsten, > > On 21.03.2014, at 21:47, Torsten Bögershausen wrote: > >> On 2014-03-21 12.36, Max Horn wrote: >> All tests passed :-), > > Excellent. > >> thanks from my side. >> comments inline, some are debatable > > Thanks for having a close look and for the constructive f

Re: [PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-21 Thread Junio C Hamano
Thanks; will replace jk/diff-funcname-cpp-regex with this series. -- 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 03/10] t4018: an infrastructure to test hunk headers

2014-03-21 Thread Junio C Hamano
Johannes Sixt writes: > Add an infrastructure that simplifies adding new tests of the hunk > header regular expressions. > > To add new tests, a file with the syntax to test can be dropped in the > directory t4018. The README file explains how a test file must contain; s/how/what/, or "how a tes

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

2014-03-21 Thread Michael Haggerty
On 03/21/2014 10:33 PM, Eric Sunshine wrote: > On Fri, Mar 21, 2014 at 5:13 PM, Michael Haggerty > wrote: >> On 03/21/2014 06:09 PM, Junio C Hamano wrote: >>> Assert() often becomes no-op in production build. I think this may >>> be an indication that "table-driven" may not be as good an approac

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

2014-03-21 Thread Max Horn
Hi Torsten, On 21.03.2014, at 21:47, Torsten Bögershausen wrote: > On 2014-03-21 12.36, Max Horn wrote: > All tests passed :-), Excellent. > thanks from my side. > comments inline, some are debatable Thanks for having a close look and for the constructive feedback! Unfortunately, I won't have

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

2014-03-21 Thread Junio C Hamano
Junio C Hamano writes: > Torsten Bögershausen 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

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

2014-03-21 Thread Eric Sunshine
On Fri, Mar 21, 2014 at 5:13 PM, Michael Haggerty wrote: > On 03/21/2014 06:09 PM, Junio C Hamano wrote: >> Eric Sunshine writes: >> >>> Sorry, you're right about message[0] case not being a crasher (though >>> the assert() still seems overkill). >> >> Assert() often becomes no-op in production b

Re: File extension conflict when working with git and latex

2014-03-21 Thread Michael Haggerty
On 03/21/2014 07:32 PM, Junio C Hamano wrote: > Matthias Beyer writes: > >> I know, I can fix this by fixing the clean task in my Makefile. But >> maybe someone somewhere on this world doesn't know the git internals >> as good as me (and, of course, my coworker). Is there _any chance >> at all_ t

Re: [PATCH 04/12] t: stop using GIT_CONFIG to cross repo boundaries

2014-03-21 Thread Junio C Hamano
Jeff King writes: > Some tests want to check or set config in another > repository. E.g., t1000 creates repositories and makes sure > that their core.bare and core.worktree settings are what we > expect. We can do this with: > > GIT_CONFIG=$repo/.git/config git config ... > > but it better show

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

2014-03-21 Thread Junio C Hamano
Jeff King writes: > 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 an

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

2014-03-21 Thread Michael Haggerty
On 03/21/2014 06:09 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> Sorry, you're right about message[0] case not being a crasher (though >> the assert() still seems overkill). > > Assert() often becomes no-op in production build. I think this may > be an indication that "table-driven" m

[PATCH 10/10] userdiff: have 'cpp' hunk header pattern catch more C++ anchor points

2014-03-21 Thread Johannes Sixt
The hunk header pattern 'cpp' is intended for C and C++ source code, but it is actually not particularly useful for the latter, and even misses some use-cases for the former. The parts of the pattern have the following flaws: - The first part matches an identifier followed immediately by a colon

[PATCH 08/10] t4018: test cases for the built-in cpp pattern

2014-03-21 Thread Johannes Sixt
A later patch changes the built-in cpp pattern. These test cases demonstrate aspects of the pattern that we do not want to change. Signed-off-by: Johannes Sixt --- t/t4018/cpp-c++-function | 4 t/t4018/cpp-class-definition | 4 t/t4018/cpp-class-definition-deriv

[PATCH 06/10] t4018: convert custom pattern test to the new infrastructure

2014-03-21 Thread Johannes Sixt
For the test case "matches to end of line", extend the pattern by a few wildcards so that the pattern captures the "RIGHT" token, which is needed for verification, without mentioning it in the pattern. Signed-off-by: Johannes Sixt --- t/t4018-diff-funcname.sh | 40 ++---

[PATCH 09/10] t4018: test cases showing that the cpp pattern misses many anchor points

2014-03-21 Thread Johannes Sixt
Most of the tests show C++ code, but there is also a union definition and a GNU style function definition that are not recognized. Signed-off-by: Johannes Sixt --- t/t4018/cpp-class-constructor | 5 + t/t4018/cpp-class-constructor-mem-init | 6 ++ t/t4018/cpp-class-destr

[PATCH 07/10] t4018: reduce test files for pattern compilation tests

2014-03-21 Thread Johannes Sixt
All test cases that need a file with specific text patterns have been converted to utilize texts in the t4018/ directory. The remaining tests in the test script deal only with the validity of the regular expressions. These tests do not depend on the contents of files that 'git diff' is invoked on.

[PATCH 03/10] t4018: an infrastructure to test hunk headers

2014-03-21 Thread Johannes Sixt
Add an infrastructure that simplifies adding new tests of the hunk header regular expressions. To add new tests, a file with the syntax to test can be dropped in the directory t4018. The README file explains how a test file must contain; the README itself tests the default behavior. Signed-off-by

[PATCH 04/10] t4018: convert perl pattern tests to the new infrastructure

2014-03-21 Thread Johannes Sixt
There is one subtlety: The old test case 'perl pattern gets full line of POD header' does not have its own new test case, but the feature is tested nevertheless by placing the RIGHT tag at the end of the expected hunk header in t4018/perl-skip-sub-in-pod. Signed-off-by: Johannes Sixt --- t/t4018

[PATCH 05/10] t4018: convert java pattern test to the new infrastructure

2014-03-21 Thread Johannes Sixt
Signed-off-by: Johannes Sixt --- t/t4018-diff-funcname.sh | 4 t/t4018/java-class-member-function | 8 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 t/t4018/java-class-member-function diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh

[PATCH 02/10] userdiff: support unsigned and long long suffixes of integer constants

2014-03-21 Thread Johannes Sixt
Do not split constants such as 123U, 456ll, 789UL at the first U or second L. Signed-off-by: Johannes Sixt --- userdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index 434535b..8830417 100644 --- a/userdiff.c +++ b/userdiff.c @@ -132,7 +132,7 @

[PATCH 01/10] userdiff: support C++ ->* and .* operators in the word regexp

2014-03-21 Thread Johannes Sixt
The character sequences ->* and .* are valid C++ operators. Keep them together in --word-diff mode. Signed-off-by: Johannes Sixt --- userdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index 10b61ec..434535b 100644 --- a/userdiff.c +++ b/userdif

[PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-21 Thread Johannes Sixt
Here is a series that makes the hunk header pattern for C and C++ even simpler than suggested by Peff in [1] to catch a lot more C++ functions and two more C patterns. As a preparatory work, the test cases are totally rewritten to make it a lot simpler to drop in new tests. There was an earlier at

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

2014-03-21 Thread Junio C Hamano
Torsten Bögershausen 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, > like this:

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

2014-03-21 Thread Torsten Bögershausen
On 2014-03-21 12.36, Max Horn wrote: All tests passed :-), thanks from my side. comments inline, some are debatable > 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 h

Re: [GUILT 00/28] Teach guilt import-commit how create legal patch names, and more

2014-03-21 Thread Jeff Sipek
On Fri, Mar 21, 2014 at 08:31:38AM +0100, Per Cederqvist wrote: > I recently found myself sitting on a train with a computer in front of > me. I tried to use "guilt import-commit", which seemed to work, but > when I tried to "guilt push" the commits I had just imported I got > some errors. It tur

Re: [PATCH 11/12] t0001: drop useless subshells

2014-03-21 Thread Eric Sunshine
On Thu, Mar 20, 2014 at 7:21 PM, Jeff King wrote: > 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 > --- > These ones should produce n

Re: Git server memory requirements

2014-03-21 Thread Robin H. Johnson
On Fri, Mar 21, 2014 at 01:38:01PM -0400, Cliff Brake wrote: > I'm trying to get an idea how much memory is required for a git server > that is hosting linux kernel repos. Speaking for Gentoo here, as we're working on our large repo migration, and this was a concern originally. So far it's best mi

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

2014-03-21 Thread David Tran
Duy Nguyen gmail.com> writes: > On Fri, Mar 21, 2014 at 2:09 AM, David Tran gmail.com> wrote: > > Nguyễn Thái Ngọc Duy 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

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

2014-03-21 Thread Karsten Blees
Am 20.03.2014 22:56, schrieb Stefan Zager: > On Thu, Mar 20, 2014 at 2:35 PM, Karsten Blees > 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 >>

Re: [PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit()

2014-03-21 Thread Ashwin Jha
On 03/22/2014 12:11 AM, Eric Sunshine wrote: On Fri, Mar 21, 2014 at 5:18 AM, Ashwin Jha wrote: On Fri, Mar 21, 2014 at 9:03 AM, Eric Sunshine wrote: On Thu, Mar 20, 2014 at 9:54 PM, Ashwin Jha wrote: Subject: [PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit() starts_with() seems mu

Re: [PATCH v2] Rewrite fsck.c:fsck_commit() replace memcmp() with starts_with()

2014-03-21 Thread Eric Sunshine
In addition to the valuable review comments by Junio and Matthieu, see a few more below... On Fri, Mar 21, 2014 at 12:37 PM, blacksimit wrote: > From: Oguzhan Unlu > > My solution to make lines containing buffer += a_number; clearer to anyone is > following; I defined a new int, magic_num, then

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

2014-03-21 Thread Eric Sunshine
On Fri, Mar 21, 2014 at 2:56 PM, Andrei Dinu wrote: > Subject: [PATCH 1/2] diff-no-index.c: rename read_directory() It is helpful to reviewers if you indicate that this is a resubmission by placing 'vN' inside [...], where N is the reroll number. For instance, if this is your fourth version of th

Re: [PATCH v2] Rewrite fsck.c:fsck_commit() replace memcmp() with starts_with()

2014-03-21 Thread Matthieu Moy
blacksimit writes: > - > +int magic_num; > + > +magic_num = strlen("tree "); /* magic_num is 5 */ > if (!starts_with(buffer, "tree ")) Whitespace damage. It seems you have set your tab-width to something other than 8, and indented with spaces. Please don't do either. > +m

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

2014-03-21 Thread Andrei Dinu
Use is_dot_or_dotdot() instead of manually checking against "." or "..". Signed-off-by: Andrei Dinu --- You can check the last version here: http://thread.gmane.org/gmane.comp.version-control.git/244578 I received the feedback and make the changes. I plan on applying to GSoC 2014 diff

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

2014-03-21 Thread Andrei Dinu
A subsequent patch will include dir.h in diff-no-index.c to access is_dot_or_dotdot(), however, dir.h declared a read_directory() which conflicts with a (different) read_directory() defined in diff-no-index.c. Rename read_directory() from diff-no-index.c to avoid the conflict. Signed-off-by: A

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
Jeff King writes: > [1] Is there a word to mean the "pluralness" of a noun or verb (similar > to "tense" for a verb). I've seen "plural vs singular" often mentioned in the context of subject and verb agreement. en.wiktionary.org/wiki/concord talks about agreement "in gender, number, person,

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

2014-03-21 Thread Karsten Blees
Am 21.03.2014 06:35, schrieb Stefan Zager: > On Thu, Mar 20, 2014 at 10:21 PM, Duy Nguyen wrote: >> On Fri, Mar 21, 2014 at 08:51:18AM +0700, Duy Nguyen wrote: >>> On Thu, Mar 20, 2014 at 11:08 PM, Stefan Zager wrote: Duy, would you like to re-post your patch without the new pread impl

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
Jeff King writes: > On Fri, Mar 21, 2014 at 10:31:59AM -0700, Junio C Hamano wrote: > >> -- >8 -- >> From: Chris Angelico >> Date: Fri, 21 Mar 2014 15:07:08 +1100 >> Subject: [PATCH] config.txt: third-party tools may and do use their own >> variables >> [...] >> +Other git-related tools may and

Re: [PATCH v2] Rewrite fsck.c:fsck_commit() replace memcmp() with starts_with()

2014-03-21 Thread Junio C Hamano
blacksimit writes: > From: Oguzhan Unlu > > My solution to make lines containing buffer += a_number; clearer to anyone is > following; I defined a new int, magic_num, then assigned lengths of used > strings to magic_num and then changed assignment lines through using > magic_num so that where

Re: [PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit()

2014-03-21 Thread Eric Sunshine
On Fri, Mar 21, 2014 at 5:18 AM, Ashwin Jha wrote: > On Fri, Mar 21, 2014 at 9:03 AM, Eric Sunshine > wrote: >> On Thu, Mar 20, 2014 at 9:54 PM, Ashwin Jha wrote: >> > Subject: [PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit() >> > starts_with() seems much more relevant than memcmp(). It

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

2014-03-21 Thread Karsten Blees
Am 20.03.2014 02:25, schrieb Duy Nguyen: > On Thu, Mar 20, 2014 at 4:35 AM, Stefan Zager 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' >

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Brian Bourn
On Fri, Mar 21, 2014 at 2:07 PM, Jeff King wrote: > On Fri, Mar 21, 2014 at 02:03:41PM -0400, Brian Bourn wrote: > >> > What do they do, what does the caller expect to see (do they get >> > something as return values? do they expect some side effects?)? >> >> so something like this would be bette

Re: File extension conflict when working with git and latex

2014-03-21 Thread Junio C Hamano
Matthias Beyer writes: > I know, I can fix this by fixing the clean task in my Makefile. But > maybe someone somewhere on this world doesn't know the git internals > as good as me (and, of course, my coworker). Is there _any chance > at all_ that this gets mentioned somewhere, so others don't fal

Re: Configuring a third-party git hook

2014-03-21 Thread Jeff King
On Fri, Mar 21, 2014 at 10:31:59AM -0700, Junio C Hamano wrote: > -- >8 -- > From: Chris Angelico > Date: Fri, 21 Mar 2014 15:07:08 +1100 > Subject: [PATCH] config.txt: third-party tools may and do use their own > variables > [...] > +Other git-related tools may and do use their own variables.

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Jeff King
On Fri, Mar 21, 2014 at 02:03:41PM -0400, Brian Bourn wrote: > > What do they do, what does the caller expect to see (do they get > > something as return values? do they expect some side effects?)? > > so something like this would be better I'm assuming? > > Some basic sample API calls are foun

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Brian Bourn
On Fri, Mar 21, 2014 at 1:45 PM, Junio C Hamano wrote: > Brian Bourn writes: > >> Something like this? >> >> Sample api calls >> Add_Opt_Group() >> Parse_with_contains() >> Parse_with_merged() >> Parse_with_no_merged() >> Parse_with_formatting() >> (each of the 4 calls above may have internal cal

Re: [PATCH v5] use starts_with() instead of !memcmp()

2014-03-21 Thread Eric Sunshine
On Fri, Mar 21, 2014 at 12:53 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> On Tue, Mar 18, 2014 at 9:18 PM, Quint Guvernator >> wrote: >>> Another version, this time very in line with the review and commentary of >>> Junio, Eric, and Michael. This version boasts a revamped commit mess

Re: [PATCH] doc: status, remove leftover statement about '#' prefix

2014-03-21 Thread Junio C Hamano
Dirk Wallenstein writes: > This hasn't been true since 2556b9962e7c0353d562b7bf70eed11d8f29d0b0 > > Signed-off-by: Dirk Wallenstein > --- Good eyes. Thanks. > Documentation/git-status.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-status.txt b/

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

2014-03-21 Thread Junio C Hamano
Justin Lebar writes: > 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? While a patch is still in an early discussion stage, consider their earlier incarnation rejected and send them afres

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

2014-03-21 Thread Junio C Hamano
Justin Lebar writes: > 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 >>>

Re: Configuring a third-party git hook

2014-03-21 Thread Chris Angelico
On Sat, Mar 22, 2014 at 4:31 AM, Junio C Hamano wrote: > Chris Angelico writes: > >> On Fri, Mar 21, 2014 at 2:43 PM, Jeff King wrote: >>> Thanks, the new text looks good to me. Please follow SubmittingPatches >>> (notably, you need to sign-off your work, and please send patches inline >>> rathe

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Junio C Hamano
Brian Bourn writes: > Something like this? > > Sample api calls > Add_Opt_Group() > Parse_with_contains() > Parse_with_merged() > Parse_with_no_merged() > Parse_with_formatting() > (each of the 4 calls above may have internal calls within the library > in order to parse the option for each of the

Git server memory requirements

2014-03-21 Thread Cliff Brake
I'm trying to get an idea how much memory is required for a git server that is hosting linux kernel repos. What we're seeing is that git uses around 1GB of RAM on the server when a user does a clone of the Linux kernel source over ssh. Does this seem about right? Is this amount fixed, or arbitra

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

2014-03-21 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >>> diff --git a/wt-status.c b/wt-status.c >>> index a452407..e55e5b9 100644 >>> --- a/wt-status.c >>> +++ b/wt-status.c >>> @@ -1509,19 +1509,23 @@ static void wt_shortstatus_print_tracking(struct >>> wt_status *s) >>> return; >>>

Re: Configuring a third-party git hook

2014-03-21 Thread Junio C Hamano
Chris Angelico writes: > On Fri, Mar 21, 2014 at 2:43 PM, Jeff King wrote: >> Thanks, the new text looks good to me. Please follow SubmittingPatches >> (notably, you need to sign-off your work, and please send patches inline >> rather than as attachments). > > Ah, didn't see that file. It appea

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

2014-03-21 Thread kirr
Junio, On Thu, Mar 20, 2014 at 03:31:35PM -0700, Junio C Hamano wrote: > Junio C Hamano 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 tha

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

2014-03-21 Thread Junio C Hamano
Eric Sunshine writes: > Sorry, you're right about message[0] case not being a crasher (though > the assert() still seems overkill). Assert() often becomes no-op in production build. I think this may be an indication that "table-driven" may not be as good an approach as many candidates thought.

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

2014-03-21 Thread Junio C Hamano
Ilya Bobyr writes: >>> + ``, if specified, is used as a name of the argument in the >>> + help output, for options that take arguments. `` is >>> + terminated by the first whitespace. When output the name is shown in >>> + angle braces. Underscore symbols are replaced with spaces. >> The

Re: File extension conflict when working with git and latex

2014-03-21 Thread Simon Ruderich
On Fri, Mar 21, 2014 at 05:46:51PM +0100, Matthias Beyer wrote: > Hi Simon, > > I think so. I executed: > > git fsck # reports N missing blobs, commits, trees and dangling stuff > git index-pack ... > git fsck # reports only dangling commits and blobs > > I don't know if this means that

Re: [PATCH v5] use starts_with() instead of !memcmp()

2014-03-21 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Mar 18, 2014 at 9:18 PM, Quint Guvernator > wrote: >> Another version, this time very in line with the review and commentary of >> Junio, Eric, and Michael. This version boasts a revamped commit message and >> fewer but surer hunks changed. > > Explaining what ch

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

2014-03-21 Thread Junio C Hamano
Dragos Foianu writes: > I'm not sure it's worth pursuing the table approach further, especially > since a solution has already been accepted and merged into the codebase. Yes. I would further say that you already qualify as having finished a microproject, if I were a part of the candidate selec

Re: File extension conflict when working with git and latex

2014-03-21 Thread Matthias Beyer
On 21-03-2014 17:36:28, Simon Ruderich wrote: > On Fri, Mar 21, 2014 at 05:13:24PM +0100, Matthias Beyer wrote: > > Unfortunetely, we wrote our `make clean` task recursively. I think you > > can imagine what went wrong: The clean-task corrupted the repository, > > as it removed .idx files from with

[PATCH v2] Rewrite fsck.c:fsck_commit() replace memcmp() with starts_with()

2014-03-21 Thread blacksimit
From: Oguzhan Unlu My solution to make lines containing buffer += a_number; clearer to anyone is following; I defined a new int, magic_num, then assigned lengths of used strings to magic_num and then changed assignment lines through using magic_num so that where the number which is added to bu

Re: File extension conflict when working with git and latex

2014-03-21 Thread Simon Ruderich
On Fri, Mar 21, 2014 at 05:13:24PM +0100, Matthias Beyer wrote: > Unfortunetely, we wrote our `make clean` task recursively. I think you > can imagine what went wrong: The clean-task corrupted the repository, > as it removed .idx files from within .git/. > > I lost work because of this ugly name co

File extension conflict when working with git and latex

2014-03-21 Thread Matthias Beyer
Hi, I struggled with a really nasty issue today (and yesterday): I work on a semester project paper which is written in latex and therefor version-controlled with git. We compile the document using pdflatex, we automate the compiling with make. pdflatex generates some temporary files, which are

RE: Want to start using Git on my windows 7 system.

2014-03-21 Thread Jim Garrison
> -Original Message- > Behalf Of Izundu Kingsley > Sent: Friday, March 21, 2014 8:08 AM > Subject: Want to start using Git on my windows 7 system. > > Good Afternoon, am very curious about how powerful git can serve > programmers and computer users. I will be glad if am helped with the git

Re: [PATCH v5] commit.c: use skip_prefix() instead of starts_with()

2014-03-21 Thread Michael Haggerty
On 03/21/2014 04:48 PM, Michael Haggerty wrote: > On 03/04/2014 11:07 PM, Tanay Abhra wrote: >> [...] >> +found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1); >> +if(!found) { > > Nit: There should be a space between "if" and the opening parenthesis. Oops, I see I a

Re: [PATCH v5] commit.c: use skip_prefix() instead of starts_with()

2014-03-21 Thread Michael Haggerty
On 03/04/2014 11:07 PM, Tanay Abhra wrote: > In record_author_date() & parse_gpg_output(), the callers of > starts_with() not just want to know if the string starts with the > prefix, but also can benefit from knowing the string that follows > the prefix. > > By using skip_prefix(), we can do both

Re: [PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit()

2014-03-21 Thread Ashwin Jha
Original Message Subject:[PATCH] GSoC Miniproject 15. Rewrite fsck.c:fsck_commit() Date: Fri, 21 Mar 2014 07:24:46 +0530 From: Ashwin Jha To: git@vger.kernel.org CC: Ashwin Jha modified fsck.c:fsck_commit(). Replaced memcmp() with starts_with() function.

Want to start using Git on my windows 7 system.

2014-03-21 Thread Izundu Kingsley
Good Afternoon, am very curious about how powerful git can serve programmers and computer users. I will be glad if am helped with the git installation files, that is the files I will need to get git on my system and some hand-on materials for a quick get along. I will like to teach other of my f

[PATCH] doc: status, remove leftover statement about '#' prefix

2014-03-21 Thread Dirk Wallenstein
This hasn't been true since 2556b9962e7c0353d562b7bf70eed11d8f29d0b0 Signed-off-by: Dirk Wallenstein --- Documentation/git-status.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index a4acaa0..def635f 100644 ---

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

2014-03-21 Thread Matthieu Moy
Mustafa Orkun Acar writes: > Hi,  > I have completed my proposal about this project. But in one of the previous > emails; it says that the aim of the project is not storing configuration data > in the memory instead of making multiple git_config() calls. I > also understand the project in this

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

2014-03-21 Thread Duy Nguyen
On Fri, Mar 21, 2014 at 2:09 AM, David Tran wrote: > Nguyễn Thái Ngọc Duy 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 >> 7326d1f1a67edf21947ae98194f9

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

2014-03-21 Thread Duy Nguyen
On Fri, Mar 21, 2014 at 12:41 AM, Junio C Hamano wrote: > Why even include cache.h for S_IXUSR? > > In the context of the patch I see S_ISGID mentioned and other S_* > st_mode things are already in use in this function before this step, > and presumably you are using them without problems, no? My

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

2014-03-21 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 failed because git-remote-hg was not be able to create the corresponding reference. Warn t

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

2014-03-21 Thread Michael Haggerty
On 03/20/2014 08:39 PM, George Papanikolaou wrote: > 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

Re: [RFC] [GSoC] Draft of Proposal for GSoC

2014-03-21 Thread Brian Bourn
Parts of v2, once again, i'd love some more comments on what I've rewritten On Fri, Mar 21, 2014 at 1:42 AM, Jeff King wrote: > On Thu, Mar 20, 2014 at 02:15:29PM -0400, Brian Bourn wrote: > >> Going through the annals of the listserve thus far I've found a few >> discussions which provide some

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

2014-03-21 Thread Matthieu Moy
Junio C Hamano writes: >> diff --git a/wt-status.c b/wt-status.c >> index a452407..e55e5b9 100644 >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1509,19 +1509,23 @@ static void wt_shortstatus_print_tracking(struct >> wt_status *s) >> return; >> } >> >> +const char *gone

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

2014-03-21 Thread Matthieu Moy
Yao Zhao writes: > 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 we added should be linked to a manipulation of inner > structure? And I need to find the connection to make this abstraction? Sorry,

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

2014-03-21 Thread David Kastrup
Junio C Hamano writes: > 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 it in half and > declare that value the initial version of a sane threashold", > nothin

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

2014-03-21 Thread David Kastrup
Jeff King writes: > If you have before-and-after numbers for just this patch on some > repository, that would be an interesting thing to put in the commit > message. It's a hen-and-egg problem regarding the benchmarks. The most impressive benchmarks arise with the git-blame performance work in

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

2014-03-21 Thread Duy Nguyen
On Fri, Mar 21, 2014 at 1:04 PM, David Kastrup wrote: >> Hmm, doesn't packing need to read existing data? > > Judging from the frequent out-of-memory conditions of git gc > --aggressive, packing is not restrained by deltaBaseCacheLimit. pack-objects memory usage is more controlled by pack.windowm

Re: [GUILT 20/28] "guilt graph": Handle patch names containing quotes.

2014-03-21 Thread Eric Sunshine
On Fri, Mar 21, 2014 at 3:31 AM, Per Cederqvist wrote: > Quote quotes with a backslash in the "guitl graph" output. Otherwise, s/guitl/guilt/ > the "dot" file could contain syntax errors. > > Added a test case. > --- > guilt-graph | 2 ++ > regression/t-033.out | 22 +

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

2014-03-21 Thread Ilya Bobyr
On 3/20/2014 4:19 PM, Ilya Bobyr wrote: > On 3/20/2014 11:38 AM, Junio C Hamano wrote: >> Ilya Bobyr writes: >> >>> [...] >>> >>> -* SP+ help LF >>> +*? SP+ help LF >>> >>> ``:: >>> @@ -313,6 +313,12 @@ Each line of options has this format: >>> * Use `!`

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

2014-03-21 Thread David Kastrup
Junio C Hamano writes: > David Kastrup writes: > >> Junio C Hamano writes: >> >>> Duy Nguyen 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 twe

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

2014-03-21 Thread David Kastrup
Jeff King writes: > 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 measurem

[GUILT 17/28] "guilt graph" no longer loops when no patches are applied.

2014-03-21 Thread Per Cederqvist
Give an error message if no patches are applied. Added a test case that never terminates unless this fix is applied. Signed-off-by: Per Cederqvist --- guilt-graph | 10 -- regression/t-033.out | 3 +++ regression/t-033.sh | 11 +++ 3 files changed, 22 insertions(+), 2

[GUILT 04/28] Allow "guilt import-commit" to run from a dir which contains spaces.

2014-03-21 Thread Per Cederqvist
Signed-off-by: Per Cederqvist --- guilt-import-commit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guilt-import-commit b/guilt-import-commit index 20dcee2..9488ded 100755 --- a/guilt-import-commit +++ b/guilt-import-commit @@ -23,7 +23,7 @@ if ! must_commit_first; the

[GUILT 01/28] The tests should not fail if guilt.diffstat is set.

2014-03-21 Thread Per Cederqvist
Explicitly set guilt.diffstat to its default value. Without this, the 027 test (and possibly others) fail if guilt.diffstat is set to true in ~/.gitconfig. Signed-off-by: Per Cederqvist --- regression/scaffold | 1 + 1 file changed, 1 insertion(+) diff --git a/regression/scaffold b/regression/

[GUILT 10/28] Run test_failed if the exit status of a test script is bad.

2014-03-21 Thread Per Cederqvist
There were two problems with the old code: - Since "set -e" is in effect (that is set in scaffold) the run-test script exited immediately if a t-*.sh script failed. This is not nice, as we want the error report that test_failed prints. - The code ran "cd -" between running the t-*.sh scr

[GUILT 14/28] Use "git check-ref-format" to validate patch names.

2014-03-21 Thread Per Cederqvist
The valid_patchname now lets "git check-ref-format" do its job instead of trying (and failing) to implement the same rules. See git-check-ref-format(1) for a list of the rules. Refer to the git-check-ref-format(1) man page in the error messages produced when valid_patchname indicates that the nam

[GUILT 24/28] disp no longer processes backslashes.

2014-03-21 Thread Per Cederqvist
Only one invocation of "disp" or "_disp" actually needed backslash processing. In quite a few instances, it was wrong to do backslash processing, as the message contained data derived from the user. Created the new function "disp_e" that should be used when backslash processing is required, and c

[GUILT 11/28] test suite: remove pointless redirection.

2014-03-21 Thread Per Cederqvist
The shouldfail function already redirects stderr to stdout, so there is no need to do the same in t-028.sh and t-021.sh. Signed-off-by: Per Cederqvist --- regression/t-021.sh | 2 +- regression/t-025.sh | 2 +- regression/t-028.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --

[GUILT 19/28] Check that "guilt graph" works when working on a branch with a comma.

2014-03-21 Thread Per Cederqvist
git branch names can contain commas. Check that "guilt graph" works even in that case. Signed-off-by: Per Cederqvist --- regression/t-033.out | 62 regression/t-033.sh | 37 +++ 2 files changed, 99 insertions(+)

[GUILT 18/28] guilt-graph: Handle commas in branch names.

2014-03-21 Thread Per Cederqvist
This fix relies on the fact that git branch names can not contain ":". Signed-off-by: Per Cederqvist --- guilt-graph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt-graph b/guilt-graph index 00301d5..575f03b 100755 --- a/guilt-graph +++ b/guilt-graph @@ -52,7 +52,7 @@ s

[GUILT 22/28] The log.decorate setting should not influence patchbomb.

2014-03-21 Thread Per Cederqvist
Signed-off-by: Per Cederqvist --- guilt-patchbomb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt-patchbomb b/guilt-patchbomb index 1231418..164b10c 100755 --- a/guilt-patchbomb +++ b/guilt-patchbomb @@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then fi # display the list of co

[GUILT 07/28] Added test cases for "guilt fold".

2014-03-21 Thread Per Cederqvist
Test that we can combine any combination of patches with empty and non-empty messages, both with and without guilt.diffstat. (All patches are empty.) Signed-off-by: Per Cederqvist --- regression/t-035.out | 659 +++ regression/t-035.sh | 88

  1   2   >