[PATCH 06/13] Makefile: store GIT-* sentinel files in MAKE/

2014-02-05 Thread Jeff King
-VERSION-FILE. This could be moved along with the rest, but there is a reasonable chance that there are some out-of-tree scripts that may peek at it (whereas things like GIT-CFLAGS are purely internal, and we update all internal references). Signed-off-by: Jeff King p...@peff.net --- I'm not married

[PATCH 09/13] Makefile: add c-quote helper function

2014-02-05 Thread Jeff King
-quoting but did not. For example: make prefix='foo\bar' would produce an exec_cmd.o with a broken prefix. Signed-off-by: Jeff King p...@peff.net --- Makefile | 58 +- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b

[PATCH 08/13] Makefile: introduce sq function for shell-quoting

2014-02-05 Thread Jeff King
variants of many variables (note that we do not do this just yet, as there is a little more cleanup needed first). Signed-off-by: Jeff King p...@peff.net --- This is the one I am most on the fence about. I think (2) is nice. And for (1), we do end up more readable in some instances (e.g

[PATCH 10/13] Makefile: drop *_SQ variables

2014-02-05 Thread Jeff King
Now that all uses of the SQ variables have been dropped, we can stop setting the variables. Signed-off-by: Jeff King p...@peff.net --- Makefile | 28 1 file changed, 28 deletions(-) diff --git a/Makefile b/Makefile index b1c3fb4..cd07a70 100644 --- a/Makefile +++ b

[PATCH 03/13] Makefile: introduce make-var helper function

2014-02-05 Thread Jeff King
$@+ mv $@+ $@ where the rules are generated by a shell (or other) script. Signed-off-by: Jeff King p...@peff.net --- Makefile | 105 --- 1 file changed, 40 insertions(+), 65 deletions(-) diff --git a/Makefile b/Makefile

[PATCH 01/13] Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS

2014-02-05 Thread Jeff King
not respect GIT-CFLAGS. Later, e4dd89a (Makefile: update scripts when build-time parameters change, 2012-06-20) introduced a separate GIT-SCRIPT-DEFINES to accomplish this, which also included USE_GETTEXT_SCHEME. We can drop the redundant and useless mention in GIT-CFLAGS. Signed-off-by: Jeff King p

[PATCH 11/13] Makefile: auto-build C strings from make variables

2014-02-05 Thread Jeff King
. Even when we do generate the dependencies, we rely on being able to compile the file once, which means our system cannot handle generated headers without a manual dependency to bootstrap it. Signed-off-by: Jeff King p...@peff.net --- This is a technique that I have used in other

[PATCH 13/13] move LESS/LV pager environment to Makefile

2014-02-05 Thread Jeff King
. Signed-off-by: Jeff King p...@peff.net --- Bits of this patch were liberally stolen from Junio's weather-balloon patch. All bugs are mine. :) Note that setup_pager_env in the C code still does do a little parsing, since we need to have the name of each variable in a separate buffer to pass to getenv

[PATCH 12/13] Makefile: teach scripts to include make variables

2014-02-05 Thread Jeff King
. Signed-off-by: Jeff King p...@peff.net --- The astute reader will notice that: MAKE_DIFF='diff' $MAKE_DIFF ... that we end up with is not _quite_ the same as replacing $MAKE_DIFF in the actual script text with diff at build-time. In particular, the way that whitespace and quotes are treated

[PATCH 05/13] Makefile: prefer printf to echo for GIT-*

2014-02-05 Thread Jeff King
-off-by: Jeff King p...@peff.net --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b06d5ec..60dc53b 100644 --- a/Makefile +++ b/Makefile @@ -1571,7 +1571,7 @@ GIT-$1: FORCE @VALUE='$$(subst ','\'',$3)'; \ if test xVALUE != x

Re: [PATCH 09/13] Makefile: add c-quote helper function

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 11:13:24AM -0800, Junio C Hamano wrote: +# Quote the value as C string inside a shell string. Good for passing strings +# on the command line via -DFOO=$(call # scq,$(FOO)). call # scq??? Whoops. Bad rewrapping of the comment. It should obviously just be

Re: [PATCH 11/13] Makefile: auto-build C strings from make variables

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 11:17:13AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: diff --git a/script/mkcstring b/script/mkcstring new file mode 100644 index 000..c01f430 --- /dev/null +++ b/script/mkcstring @@ -0,0 +1,18 @@ +#!/bin/sh + +name=$1; shift

Re: [PATCH 13/13] move LESS/LV pager environment to Makefile

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 01:08:57PM -0500, Jeff King wrote: +quote() { + echo $1 | sed 's/\\//g; s//\\/' +} This of course has the same /g bug as the earlier patch in the series. I was tempted to pull the function out into script/lib-c.sh, so that both can source it, but perhaps

Re: [PATCH 12/13] Makefile: teach scripts to include make variables

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 11:26:58AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: define cmd_munge_script $(RM) $@ $@+ \ +{ \ +includes=$(filter MAKE/%.sh,$^); \ +if ! test -z $$includes; then \ + cat $$includes; \ +fi \ sed -e '1s|#!.*/sh|#!$(call sqi

Re: [PATCH 13/13] move LESS/LV pager environment to Makefile

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 02:23:50PM -0500, Jeff King wrote: On Wed, Feb 05, 2014 at 01:08:57PM -0500, Jeff King wrote: +quote() { + echo $1 | sed 's/\\//g; s//\\/' +} This of course has the same /g bug as the earlier patch in the series. I was tempted to pull the function out

Re: [PATCH] repack.c: rename and unlink pack file if it exists

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 12:06:41PM -0800, Junio C Hamano wrote: Actually, since 1190a1ac, if you have repacked and gotten the same pack name, then you do not have to do any rename dance at all; you can throw away what you just generated because you know that it is byte-for-byte identical.

Re: [PATCH] repack.c: rename and unlink pack file if it exists

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 12:31:34PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: The minimal fix you posted below does make sense to me as a stopgap, and we can look into dropping the code entirely during the next cycle. It would be nice to have a test to cover this case

Re: [Bug] branch.*.merge interpreted too strictly by tracking logic

2014-02-05 Thread Jeff King
On Tue, Feb 04, 2014 at 02:49:16PM -0800, Junio C Hamano wrote: Let's tell these branches that they are both supposed to be building on top of 'master'. : gitster track/master; git config branch.foo.remote . : gitster track/master; git config branch.foo.merge refs/heads/master

Re: [PATCH] repack.c: rename and unlink pack file if it exists

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 03:37:40PM -0500, Jeff King wrote: Sounds sensible. Run repack -a -d once, and then another while forcing it to be single threaded, or something? Certainly that's the way to trigger the code, but doing this: [...] ...does not seem to fail, and it does not seem

Re: [PATCH] repack.c: rename and unlink pack file if it exists

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 12:57:14PM -0800, Junio C Hamano wrote: ...does not seem to fail, and it does not seem to leave any cruft in place. So maybe I am misunderstanding the thing the patch is meant to fix. Is it that we simply do not replace the pack in this instance? Yes. Not just

Re: [Bug] branch.*.merge interpreted too strictly by tracking logic

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 01:05:04PM -0800, Junio C Hamano wrote: I don't recall us ever doing anything after that. I don't have a problem with making it work, of course, but I am not sure if it is really a bug. Once people get used to us being extra nice in some places, other less nice

Re: [PATCH] repack.c: rename and unlink pack file if it exists

2014-02-05 Thread Jeff King
On Wed, Feb 05, 2014 at 01:08:36PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... So the fact that this bug exists doesn't really produce any user-visible behavior, and hopefully post-release we would drop the code entirely, and the test would have no reason to exist

[RFH] hackday and GSoC topic suggestions

2014-02-05 Thread Jeff King
This Saturday I'm going to be attending a Git hackday held by Bloomberg in New York. The participants will be eager C coders who have experience using git, but not contributing to it. As somebody who has read The Mythical Man Month, I don't expect huge productivity, but I'm hoping to do some bug

Re: [PATCH 1/6] test: rename http fetch and push test files

2014-02-06 Thread Jeff King
On Thu, Feb 06, 2014 at 10:10:34PM +0700, Nguyễn Thái Ngọc Duy wrote: Make clear which one is for dumb protocol, which one is for smart from their file name. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Yay. This has often bugged me, and I can't believe we went this long without

Re: [PATCH 2/6] t5538: fix default http port

2014-02-06 Thread Jeff King
On Thu, Feb 06, 2014 at 10:10:35PM +0700, Nguyễn Thái Ngọc Duy wrote: Originally I had t5537 use port 5536 and 5538 use port 5537(!). Then Jeff found my fault so I changed port in t5537 from 5536 to 5537 in 3b32a7c (t5537: fix incorrect expectation in test case 10 - 2014-01-08). Which makes

Re: [PATCH 5/6] protocol-capabilities.txt: document no-done

2014-02-06 Thread Jeff King
On Thu, Feb 06, 2014 at 10:10:38PM +0700, Nguyễn Thái Ngọc Duy wrote: See 3e63b21 (upload-pack: Implement no-done capability - 2011-03-14) and 761ecf0 (fetch-pack: Implement no-done capability - 2011-03-14) for more information. Content looks good. A few minor grammar nits: +no-done

Re: [PATCH 6/6] fetch-pack: fix deepen shallow over smart http with no-done cap

2014-02-06 Thread Jeff King
On Thu, Feb 06, 2014 at 10:10:39PM +0700, Nguyễn Thái Ngọc Duy wrote: In smart http, upload-pack adds new shallow lines at the beginning of each rpc response. Only shallow lines from the first rpc call are useful. After that they are thrown away. It's designed this way because upload-pack is

Re: [PATCH 0/6] Fix the shallow deepen bug with no-done

2014-02-06 Thread Jeff King
On Thu, Feb 06, 2014 at 11:31:02AM -0800, Junio C Hamano wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Reported by Jeff [1]. Junio spotted it right but nobody made any move since then. Hrm. Was I supposed to make any move at that point? The discussion ended by me asking a

Re: [PATCH 2/6] t5538: fix default http port

2014-02-07 Thread Jeff King
On Thu, Feb 06, 2014 at 02:35:33PM -0500, Jeff King wrote: On Thu, Feb 06, 2014 at 10:10:35PM +0700, Nguyễn Thái Ngọc Duy wrote: Originally I had t5537 use port 5536 and 5538 use port 5537(!). Then Jeff found my fault so I changed port in t5537 from 5536 to 5537 in 3b32a7c (t5537: fix

Re: [PATCH 0/2] Ignore trailing spaces in .gitignore

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 03:10:02PM +0700, Nguyễn Thái Ngọc Duy wrote: Trailing spaces are invisible in most standard editors (*). git diff does show trailing spaces by default. But that does not help newly written .gitignore files. And trailing spaces are the source of frustration when

Re: [RFH] hackday and GSoC topic suggestions

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 07:43:40PM +0100, Thomas Rast wrote: Jeff King p...@peff.net writes: On a similar note, the GSoC application deadline is Feb 14th. I am happy to be admin again and put together the application, but we will need an idea page. I'll set up a page to collect them

Re: [PATCH] builtin/blame.c::prepare_lines: fix allocation size of sb-lineno

2014-02-08 Thread Jeff King
On Sat, Feb 08, 2014 at 10:49:40AM +0100, David Kastrup wrote: But please note that since sb-lineno originally comes from a zeroed memory area and is passed to xrealloc, this requires that after int *p; memset(p, 0, sizeof(p)); the equivalence ((void *)p == NULL) will hold. While

Re: [PATCH 12/13] Makefile: teach scripts to include make variables

2014-02-09 Thread Jeff King
On Sat, Feb 08, 2014 at 10:47:16PM +0100, Thomas Rast wrote: Jeff King p...@peff.net writes: The current scheme for getting build-time variables into a shell script is to munge the script with sed, and stick the munged variable into a special sentinel file so that make knows about

Re: [PATCH 0/2] Ignore trailing spaces in .gitignore

2014-02-09 Thread Jeff King
On Sun, Feb 09, 2014 at 06:48:18AM +0700, Duy Nguyen wrote: I guess by quoting you meant: echo 'trailing ' .gitignore This makes special. If we follow shell convention then things between .. should be literal (e.g. * is no longer a wildcard). We don't support it yet. So I rather go

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
, this fixes a case where t5537 and t5538 used the same port number (5537), and could conflict with each other when run in parallel. Signed-off-by: Jeff King p...@peff.net --- t/lib-httpd.sh | 2 +- t/t5537-fetch-shallow.sh | 1 - t/t5538-push-shallow.sh | 1 - t/t5540-http-push.sh | 1 - t

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
On Mon, Feb 10, 2014 at 02:15:24PM -0500, Jeff King wrote: Thanks. It might be worth squashing in the patch below (or sticking it on top), to cover git-daemon as well. Patch would probably be easier to read if I actually included it... -- 8 -- Subject: [PATCH] tests: auto-set git-daemon port

Re: [PATCH 2/6] t5538: fix default http port

2014-02-10 Thread Jeff King
On Mon, Feb 10, 2014 at 10:23:53AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Here it is as a Real Patch™. I just based it on master, so it can replace your 5537/5538 fix in your series. Thanks, looks good. Will put this at the bottom and rebuild the nd/http-fetch

[PATCH] tests: turn on network daemon tests by default

2014-02-10 Thread Jeff King
in their system (e.g., they uninstalled apache, but were expecting their automated test runs to test git-httpd, and would want to be notified). Signed-off-by: Jeff King p...@peff.net --- I dug in the history to see if there was any reasoning given for the current off by default setting. It looks

Re: [PATCH] tests: turn on network daemon tests by default

2014-02-11 Thread Jeff King
On Tue, Feb 11, 2014 at 11:51:18AM -0800, Junio C Hamano wrote: Those who run buildfarms may want to disable the networking test if the buildfarms are not isolated well, for example. They have to be told somewhere that now they need to explicitly disable these tests and how. I think they

Re: pack bitmap woes on Windows

2014-02-12 Thread Jeff King
= 0; i len; i++) data[i] = data[i]; any decent compiler can probably optimize it out. Original report and analysis by Brian Gernhardt. Signed-off-by: Jeff King p...@peff.net --- ewah/ewah_io.c | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ewah/ewah_io.c

[PATCH] tree-walk: be more specific about corrupt tree errors

2014-02-12 Thread Jeff King
on disk. Our sha1 check would already have found that. These errors are ones of data that is malformed in the first place. Signed-off-by: Jeff King p...@peff.net --- Michael and I have been looking off-list at some bogus trees (created by a non-git.git implementation). git-fsck unhelpfully dies

Re: [PATCH] tests: turn on network daemon tests by default

2014-02-12 Thread Jeff King
On Tue, Feb 11, 2014 at 03:58:27PM -0800, Junio C Hamano wrote: Sure. One immediate complaint is that I would probably need to do something like this in the build automation: if testing a branch without this patch then : do nothing else

Re: [PATCH] tests: turn on network daemon tests by default

2014-02-12 Thread Jeff King
On Wed, Feb 12, 2014 at 11:06:43AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Agreed, but I think the only way to know the size of those fallouts is to try it and see who complains. I would not normally be so cavalier with git itself, but I think for the test

Re: [PATCH] contrib/diff-highlight: multibyte characters diff

2014-02-12 Thread Jeff King
On Wed, Feb 12, 2014 at 11:10:49PM +, Thomas Adam wrote: On 12 February 2014 20:59, Jeff King p...@peff.net wrote: +sub decode { + my $orig = shift; + my $decoded = eval { decode_utf8($orig, Encode::FB_CROAK) }; + return defined $decoded ? I'd still advocate

Re: [PATCH] contrib/diff-highlight: multibyte characters diff

2014-02-12 Thread Jeff King
On Thu, Feb 13, 2014 at 01:17:54AM +, brian m. carlson wrote: On Wed, Feb 12, 2014 at 06:27:40PM -0500, Jeff King wrote: On Wed, Feb 12, 2014 at 11:10:49PM +, Thomas Adam wrote: On 12 February 2014 20:59, Jeff King p...@peff.net wrote: +sub decode { + my $orig

Re: [RFH] hackday and GSoC topic suggestions

2014-02-13 Thread Jeff King
On Tue, Feb 11, 2014 at 11:38:09AM -0800, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: - Branch rename breaks local downstream branches http://article.gmane.org/gmane.comp.version-control.git/241228 If you have a branch B

Re: [RFH] hackday and GSoC topic suggestions

2014-02-13 Thread Jeff King
On Tue, Feb 11, 2014 at 10:57:22AM -0800, Junio C Hamano wrote: - git stash doesn't use --index as default http://article.gmane.org/gmane.comp.version-control.git/235892 I tend to think git stash was designed to work this way from day one. Right. The thing that bothers me is the data

Re: [RFH] hackday and GSoC topic suggestions

2014-02-13 Thread Jeff King
On Thu, Feb 06, 2014 at 10:51:54AM +0100, Matthieu Moy wrote: Some of Matthieu's students worked on it a few years ago but didn't finish. Right. There was still quite some work to do, but this is most likely too small for a GSoC project. But that could be a part of it. I'm not sure how

Git GSoC 2014

2014-02-13 Thread Jeff King
The Google Summer of Code application process is upon us. We have about 34 hours until the deadline (2014-02-14T19:00 UTC) . That's not very much time, but I know some people have been thinking about projects for a while, so I have hope that we can put together an ideas page. What we need

Re: [PATCH] tests: turn on network daemon tests by default

2014-02-14 Thread Jeff King
. -- 8 -- From: Jeff King p...@peff.net Date: Mon, 10 Feb 2014 16:29:37 -0500 Subject: [PATCH] tests: turn on network daemon tests by default [...] In addition, we are forgiving of common setup failures (e.g., you do not have apache installed, or have an old version) when the tri-state is auto

Re: Git GSoC 2014

2014-02-14 Thread Jeff King
On Thu, Feb 13, 2014 at 06:17:17PM -0500, Ramkumar Ramachandra wrote: I'll throw in a few ideas from half-finished work. Thanks. A few comments: 1. Speed up git-rebase--am.sh Currently, git-rebase--am.sh is really slow because it dumps each patch to a file using git-format-patch, and

Re: Git GSoC 2014

2014-02-14 Thread Jeff King
On Fri, Feb 14, 2014 at 10:30:28AM -0500, Ramkumar Ramachandra wrote: Isn't the merge backend faster? I thought that was the point of it. I suppose, but I thought git-rebase--am.sh (the default flavor) could be improved by leveraging relatively new cherry-pick features; I assumed that the

Re: Git GSoC 2014

2014-02-14 Thread Jeff King
On Thu, Feb 13, 2014 at 04:10:37AM -0500, Jeff King wrote: The Google Summer of Code application process is upon us. We have about 34 hours until the deadline (2014-02-14T19:00 UTC) . That's not very much time, but I know some people have been thinking about projects for a while, so I have

[BUG?] git http connection reuse

2014-02-15 Thread Jeff King
I've noticed that git does not reuse http connections when fetching, and I'm trying to figure out why. It seems related to our use of two curl features: 1. If we use the curl_multi interface (even though we are doing the requests sequentially), we do not get reuse. 2. If we set

Re: [BUG?] git http connection reuse

2014-02-17 Thread Jeff King
On Sun, Feb 16, 2014 at 02:33:06PM +0100, Daniel Stenberg wrote: On Sun, 16 Feb 2014, Daniel Stenberg wrote: Right, the problem is there to make sure that a NTLM-auth connection with different credentials aren't re-used. NTLM with its connection-oriented authentication breaks the

Re: [BUG?] git http connection reuse

2014-02-17 Thread Jeff King
On Sun, Feb 16, 2014 at 01:18:52PM +0100, Daniel Stenberg wrote: On Sat, 15 Feb 2014, Kyle J. McKay wrote: If pipelining is off (the default) and total connections is not 1 it sounds to me from the description above that the requests will be executed on separate connections until the

Re: Fwd: git-reviewed: linking commits to review discussion in git

2014-02-17 Thread Jeff King
On Mon, Feb 17, 2014 at 03:12:48PM -0500, Murtuza Mukadam wrote: We have linked peer review discussions on git@vger.kernel.org to their respective commits within the main git.git repository. You can view the linked reviews from 2012 until present in the GitHub repo at:

Re: [PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

2014-02-17 Thread Jeff King
On Sun, Feb 16, 2014 at 05:22:45PM +0100, David Kastrup wrote: Not really relevant to this patch, but looking at the output of git grep config_error_nonbool seems like a serious amount of ridiculousness going on. The header shows cache.h:extern int config_error_nonbool(const char *);

Re: [BUG?] git http connection reuse

2014-02-17 Thread Jeff King
On Tue, Feb 18, 2014 at 08:13:16AM +0100, Daniel Stenberg wrote: Right; I'd expect multiple connections for parallel requests, but in this case we are completing the first and removing the handle before starting the second. Digging further, I was able to reproduce the behavior with a simple

Re: [PATCH] config: teach git config --file - to read from the standard input

2014-02-18 Thread Jeff King
. It would need different parsing rules anyway to determine that it is a tree path. The current code just uses the name field, which is wrong. Let's split that into name and path fields, use the latter for relative includes, and fill in only the former for blobs. Signed-off-by: Jeff King p

Re: [PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

2014-02-18 Thread Jeff King
On Tue, Feb 18, 2014 at 09:41:51AM +0100, David Kastrup wrote: gcc's flow analysis works with the same data as humans reading the code. If there is no information content in the function call, it makes more sense to either making it void. The point of error() returning a constant -1 is to

http: never use curl_easy_perform

2014-02-18 Thread Jeff King
; we can just factor out the relevant bits from http_request. Signed-off-by: Jeff King p...@peff.net --- http.c| 24 +++- http.h| 9 + remote-curl.c | 5 + 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/http.c b/http.c index

Re: [PATCH] tag: support --sort=version

2014-02-19 Thread Jeff King
On Wed, Feb 19, 2014 at 08:39:27PM +0700, Nguyễn Thái Ngọc Duy wrote: --sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Sounds like a good goal. I wonder, if we were to merge the for-each-ref and tag

Re: [PATCH] tag: support --sort=version

2014-02-20 Thread Jeff King
On Wed, Feb 19, 2014 at 09:19:24PM +0700, Duy Nguyen wrote: We don't need to do any of that immediately. This is mostly just me thinking aloud, to make sure we do not paint ourselves into a corner compatibility-wise. Good thinking. If you plan to use the exact same sort syntax f-e-r

Re: [PATCH] sha1_file: fix delta_stack memory leak in unpack_entry

2014-02-20 Thread Jeff King
On Fri, Feb 21, 2014 at 06:47:47AM +0700, Nguyễn Thái Ngọc Duy wrote: This delta_stack array can grow to any length depending on the actual delta chain, but we forget to free it. Normally it does not matter because we use small_delta_stack[] from stack and small_delta_stack can hold 64-delta

Re: [PATCH] tag: support --sort=version

2014-02-22 Thread Jeff King
On Fri, Feb 21, 2014 at 06:58:16PM +0700, Duy Nguyen wrote: --sort=[-][comparison:]field [...] Why not reversed order? So its syntax could be [ - ] FIELD [ : [ version | v ] ] It fits better to current f-e-r syntax where modifiers are after the colon. And it avoids the possibility

Re: [PATCH v2] tag: support --sort=spec

2014-02-22 Thread Jeff King
On Sat, Feb 22, 2014 at 10:29:22AM +0700, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- The new prereq GNULINUX is an ugly workaround until people provide strverscmp compat implementation. I hope that will happen soon as strverscmp.c does not look

Re: [PATCH] sha1_file: fix delta_stack memory leak in unpack_entry

2014-02-22 Thread Jeff King
On Fri, Feb 21, 2014 at 10:09:33AM -0800, Junio C Hamano wrote: This delta_stack array can grow to any length depending on the actual delta chain, but we forget to free it. Normally it does not matter because we use small_delta_stack[] from stack and small_delta_stack can hold 64-delta

Re: [PATCH 1/3] rename STATUS_FORMAT_NONE to STATUS_FORMAT_DEFAULT

2014-02-22 Thread Jeff King
On Sat, Feb 22, 2014 at 03:09:20AM +0800, Tay Ray Chuan wrote: In f3f47a1 (status: add --long output format option), STATUS_FORMAT_NONE was introduced, meaning the user did not specify anything. Rename this to *_DEFAULT to better indicate its meaning. Hmm. We later introduced

Re: [PATCH 3/3] make commit --verbose work with --no-status

2014-02-22 Thread Jeff King
On Sat, Feb 22, 2014 at 03:09:22AM +0800, Tay Ray Chuan wrote: @@ -1141,7 +1146,12 @@ static int parse_and_validate_options(int argc, const char *argv[], if (all argc 0) die(_(Paths with -a does not make sense.)); - if (status_format != STATUS_FORMAT_DEFAULT) +

Re: [PATCH] demonstrate git-commit --dry-run exit code behaviour

2014-02-22 Thread Jeff King
On Fri, Feb 21, 2014 at 12:21:13PM -0800, Junio C Hamano wrote: Tay Ray Chuan rcta...@gmail.com writes: In particular, show that --short and --porcelain, while implying --dry-run, do not return the same exit code as --dry-run. This is due to the wt_status.commitable flag being set only

Re: [PATCH 4/4] config: teach git config --file - to read from the standard input

2014-02-22 Thread Jeff King
On Wed, Feb 19, 2014 at 12:58:55AM +0200, Kirill A. Shutemov wrote: The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path.

Re: [PATCH] diffcore.h: be explicit about the signedness of is_binary

2014-02-23 Thread Jeff King
On Sun, Feb 23, 2014 at 07:54:47PM -0500, Richard Lowe wrote: Bitfields need to specify their signedness explicitly or the compiler is free to default as it sees fit. With compilers that default 'unsigned' (SUNWspro 12 seems to do this) the tri-state nature of is_binary vanishes and all

[PATCH 0/5] handle bogus commit dates

2014-02-23 Thread Jeff King
This series improves our handling of commit dates that are numbers, but are ridiculously large. The most critical one is the final commit, which fixes a segfault, but the others clean up various corner cases. [1/5]: t4212: test bogus timestamps with git-log [2/5]: fsck: report integer

[PATCH 1/5] t4212: test bogus timestamps with git-log

2014-02-23 Thread Jeff King
and in the latter, we produce an empty string. While at first this seems unnecessarily inconsistent, it matches the original behavior given by 9dbe7c3d. Signed-off-by: Jeff King p...@peff.net --- t/t4212-log-corrupt.sh | 21 + 1 file changed, 21 insertions(+) diff --git a/t/t4212

[PATCH 2/5] fsck: report integer overflow in author timestamps

2014-02-23 Thread Jeff King
to 64-bit (and if they haven't, they have a real problem one second later). For 64-bit systems, by the time we get close to ULONG_MAX, all systems will hopefully have been consumed in the fiery wrath of our expanding Sun. Signed-off-by: Jeff King p...@peff.net --- Note that tags don't get checked

[PATCH 3/5] date: check date overflow against time_t

2014-02-23 Thread Jeff King
it is signed), and we would overflow when using these functions. We don't know the actual size or signedness of time_t, but we can easily check for truncation with a simple assignment. Signed-off-by: Jeff King p...@peff.net --- cache.h | 1 + date.c | 17 + fsck.c | 2 +- 3 files

[PATCH 4/5] log: handle integer overflow in timestamps

2014-02-23 Thread Jeff King
system with a signed long time_t, a timestamp of 184467440730 produces a date in 1947. We also recognize overflow in the timezone field, which could produce nonsensical results. In this case we show the parsed date, but in UTC. Signed-off-by: Jeff King p...@peff.net --- A note

[PATCH 5/5] log: do not segfault on gmtime errors

2014-02-23 Thread Jeff King
and just format t=0. Signed-off-by: Jeff King p...@peff.net --- This test is of questionable portability, since we are depending on gmtime's arbitrary point to decide that our input is crazy and return NULL. The value is sufficiently large that I'd expect most to do so, though, so it may be safe. On 32

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-02-24 Thread Jeff King
On Tue, Jan 28, 2014 at 01:21:43AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: The git-repack command always passes `--honor-pack-keep` to pack-objects. This has traditionally been a good thing, as we do not want to duplicate those objects in a new pack, and we

Re: [PATCH 3/3] make commit --verbose work with --no-status

2014-02-24 Thread Jeff King
On Mon, Feb 24, 2014 at 12:24:42PM +0800, Tay Ray Chuan wrote: What happens here when there is an alternate status format _and_ --verbose is used? If I say git commit --porcelain it should imply --dry-run. But git commit --porcelain --verbose no longer does so after your patch. I

[PATCH] remote: handle pushremote config in any order order

2014-02-24 Thread Jeff King
-by: Jeff King p...@peff.net --- remote.c | 7 ++- t/t5516-fetch-push.sh | 12 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/remote.c b/remote.c index e41251e..7232a33 100644 --- a/remote.c +++ b/remote.c @@ -49,6 +49,7 @@ static int branches_nr; static

Re: Cygwin + git log = no pager!

2014-02-24 Thread Jeff King
On Mon, Feb 24, 2014 at 08:55:41PM +1300, Chris Packham wrote: Thanks for the response. I did set this environment variable in my .bashrc like so: export GIT_PAGER=less However after I do a 'git log' it is just spitting it out all at once and not entering the pager. Um OK

Re: [PATCH 4/5] log: handle integer overflow in timestamps

2014-02-24 Thread Jeff King
On Mon, Feb 24, 2014 at 11:50:00AM -0800, Junio C Hamano wrote: We also recognize overflow in the timezone field, which could produce nonsensical results. In this case we show the parsed date, but in UTC. Both are good measures to fallback to sanity, but why is that if/else? In other

Re: [PATCH 4/5] log: handle integer overflow in timestamps

2014-02-24 Thread Jeff King
On Mon, Feb 24, 2014 at 12:21:33PM -0800, Junio C Hamano wrote: +if (date_overflows(date)) +date = 0; +else { +if (ident-tz_begin ident-tz_end) +tz = strtol(ident-tz_begin, NULL, 10); +if

Re: [PATCH] remote: handle pushremote config in any order order

2014-02-24 Thread Jeff King
On Mon, Feb 24, 2014 at 12:32:32PM -0800, Junio C Hamano wrote: +test_expect_success 'branch.*.pushremote config order is irrelevant' ' + mk_test one_repo heads/master + mk_test two_repo heads/master + test_config remote.one.url one_repo + test_config remote.two.url two_repo +

Re: [PATCH v2] tag: support --sort=spec

2014-02-24 Thread Jeff King
On Tue, Feb 25, 2014 at 06:30:35AM +0700, Duy Nguyen wrote: +[ $(uname -o) = GNU/Linux ] test_set_prereq GNULINUX + can pick up the value from GIT-BUILD-OPTIONS as a prerequisite (see the way we handle NO_PERL for an example). Though if we can just grab the glibc version as a

Git in GSoC 2014

2014-02-25 Thread Jeff King
I'm pleased to announce that Git has been accepted to this year's Google Summer of Code. Student proposals will start coming in on March 22. In the meantime students will be reading our Ideas page[1] and enquiring about the program on the mailing list and on irc. There are many ways that existing

Re: [PATCH v3] tag: support --sort=spec

2014-02-26 Thread Jeff King
On Tue, Feb 25, 2014 at 07:22:15PM +0700, Nguyễn Thái Ngọc Duy wrote: versioncmp() is copied from string/strverscmp.c in glibc commit ee9247c38a8def24a59eb5cfb7196a98bef8cfdc, reformatted to Git coding style. The implementation is under LGPL-2.1 and according to [1] I can relicense it to

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-02-26 Thread Jeff King
leave packs with a .keep in place, as we do not necessarily know that we have duplicated all of their objects. Signed-off-by: Jeff King p...@peff.net --- Documentation/config.txt | 5 + Documentation/git-repack.txt | 8 builtin/repack.c | 10 +- t/t7700

Re: Git in GSoC 2014

2014-02-26 Thread Jeff King
On Tue, Feb 25, 2014 at 06:15:28PM +0100, Michael Haggerty wrote: We didn't discuss earlier whether we would have any specific requirements for students during the proposal period (e.g., having a patch accepted). It would be good to put together rules (or barring any specific

Re: [PATCH] commit.c: use the generic sha1_pos function for lookup sha1

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 02:07:47PM +0400, Dmitry S. Dolzhenko wrote: Refactor binary search in commit_graft_pos function: use generic sha1_pos function. Sounds sensible. A few administrative points for your patch: - we usually try to send patches inline, rather than as attachments. It

Re: GSoC idea: allow git rebase --interactive todo lines to take options

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote: It would be nice to support more flexibility in the todo-list commands by allowing the commands to take options. Maybe * Convert a commit into a merge commit: pick -p c0ffeee -p e1ee712 deadbab The oneline of the

Re: Git in GSoC 2014

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 11:41:21AM +0100, Michael Haggerty wrote: Yes, though I think it makes sense to put them on a separate page. We should probably write up some notes for students, too: how to get in touch with us, what do we expect of them in the pre-proposal period, what would we

Re: [PATCH v3] tag: support --sort=spec

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 06:03:40PM +0700, Duy Nguyen wrote: Cool. I think doing this makes the most sense, as we do not have to worry about build-time config (and I do not see any particular reason why we would want to use the system strverscmp on glibc systems). Another reason I want to

Re: [PATCH v3] tag: support --sort=spec

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 06:11:54PM +0700, Duy Nguyen wrote: On Wed, Feb 26, 2014 at 6:08 PM, Jeff King p...@peff.net wrote: I'd worry slightly, though, that there are other schemes where that behaves poorly. Should we optimize for git's version numbering, or for what most other projects

Re: Git in GSoC 2014

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 12:25:36PM +0100, Vicent Martí wrote: On Wed, Feb 26, 2014 at 11:41 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Since time is short, I already started on this. I wrote a first draft of an introduction for the students. I also started looking for

Re: Git in GSoC 2014

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 12:24:13PM +0100, Vicent Martí wrote: One thing I noticed after tg/index-v4-format is both libgit2 and jgit do not seem to support index v4. So we could add index v4 support on libgit2 to the idea page. It's a relatively small task though once you get a hang on

Re: GSoC idea: allow git rebase --interactive todo lines to take options

2014-02-26 Thread Jeff King
On Wed, Feb 26, 2014 at 12:14:11PM +0100, Michael Haggerty wrote: [1] The one feature I would like in this vein is that editing the title in the instruction-sheet would modify the commit message of the relevant commit. For some reason I try to do this every few weeks, but of

[PATCH] archive: add archive.restrictRemote option

2014-02-26 Thread Jeff King
dumb walker access), or the site admin may simply decide the security/convenience tradeoff is not worth it. This patch adds a new config option to turn off the restrictions added in ee27ca4. It defaults to on, meaning there is no change in behavior by default. Signed-off-by: Jeff King p...@peff.net

<    1   2   3   4   5   6   7   8   9   10   >