Re: [PATCH] t1700: make test pass with index-v4

2015-03-20 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: On 03/20, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: The different index versions have different sha-1 checksums. Those checksums are checked in t1700, which makes it fail when run with index v4. Fix it. I am more

Re: A git hook that does git cherry-pick and push automatically

2015-03-20 Thread Stefan Beller
so it's a sever side hook that it's forced down to all developers. How does that work? /me is just curious -- 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: test -chain lint

2015-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: [+cc Jonathan, whose patch I apparently subconsciously copied] On Thu, Mar 19, 2015 at 10:08:51PM -0400, Jeff King wrote: diff --git a/t/test-lib.sh b/t/test-lib.sh index c096778..02a03d5 100644 --- a/t/test-lib.sh

Re: [v3 PATCH 2/2] reset: add tests for git reset -

2015-03-20 Thread Kevin D
On Fri, Mar 20, 2015 at 04:02:38AM +0530, Sundararajan R wrote: Yes. I made a mistake while framing the sentence. I should have proof read the commit message more thoroughly. Should I submit a new patch with the corrected commit message? Yeah, you can combine that with the comments from

[PATCH 06/16] refs: convert for_each_ref_submodule to struct object_id

2015-03-20 Thread brian m. carlson
Convert the callers as well. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 4 ++-- refs.h | 2 +- revision.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 75d8970..758bdd9 100644 --- a/refs.c +++ b/refs.c @@

[PATCH 15/16] Remove unneeded *_oid functions.

2015-03-20 Thread brian m. carlson
While these functions were needed during the intermediate steps of converting for_each_ref and friends to struct object_id, there is no longer any need to have these wrapper functions. Update each of the functions that the wrapper functions call and remove the _oid wrapper functions themselves.

[PATCH 05/16] refs: convert head_ref to struct object_id

2015-03-20 Thread brian m. carlson
Convert head_ref and head_ref_submodule to use struct object_id. Introduce some wrappers in some of the callers to handle incompatibilities between each_ref_fn and each_ref_fn_oid. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/show-ref.c | 7 ++- log-tree.c

[PATCH 01/16] refs: convert struct ref_entry to use struct object_id

2015-03-20 Thread brian m. carlson
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/refs.c b/refs.c index 9edf18b..689a46d 100644 --- a/refs.c +++ b/refs.c @@ -129,7 +129,7 @@ struct ref_value

[PATCH 16/16] refs: convert struct ref_lock to struct object_id

2015-03-20 Thread brian m. carlson
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 22 +++--- refs.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/refs.c b/refs.c index 941e466..b54525a 100644 --- a/refs.c +++ b/refs.c @@ -2099,16 +2099,16 @@ static struct

[PATCH 13/16] refs: convert for_each_reflog to struct object_id

2015-03-20 Thread brian m. carlson
Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/fsck.c | 2 +- builtin/reflog.c | 4 ++-- refs.c | 10 +- refs.h | 2 +- revision.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/fsck.c

[PATCH 10/16] refs: convert namespaced ref iteration functions to object_id

2015-03-20 Thread brian m. carlson
Convert head_ref_namespaced and for_each_namespaced_ref to use struct object_id. Update the various callbacks to use struct object_id internally as well. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- http-backend.c | 14 +++--- refs.c | 12 ++-- refs.h

[PATCH 12/16] refs: rename do_for_each_ref_oid to do_for_each_ref

2015-03-20 Thread brian m. carlson
do_for_each_ref was unused due to previous patches, so rename do_for_each_ref_oid to do_for_each_ref. Similarly, remove the unused fn member from struct ref_entry in favor of renaming the fn_oid member. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 43

[PATCH 14/16] refs: rename each_ref_fn_oid to each_ref_fn

2015-03-20 Thread brian m. carlson
each_ref_fn is no longer used, so rename each_ref_fn_oid to each_ref_fn. Update the documentation to note the change in function signature. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- Documentation/technical/api-ref-iteration.txt | 2 +- refs.c

[PATCH 00/16] Convert parts of refs.c to struct object_id

2015-03-20 Thread brian m. carlson
This is part 1 of n in converting code to use struct object_id. refs.c, and the for_each_ref series of functions particularly, is the source for many instances of object IDs in the codebase. Therefore, it makes sense to convert this series of functions to provide a basis for further conversions.

[PATCH 04/16] refs: convert for_each_ref_in_submodule to object_id

2015-03-20 Thread brian m. carlson
Convert for_each_ref_in_submodule and all of its caller. Introduce two temporary wrappers in revision.c to handle the incompatibilities between each_ref_fn and each_ref_fn_oid. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- refs.c | 10 +- refs.h | 8

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Philip Oakley
From: Stefan Beller sbel...@google.com On Fri, Mar 20, 2015 at 4:23 AM, Thomas Schneider thosc...@gmail.com wrote: Signed-off-by: Thomas Schneider thosc...@gmail.com --- dblatex does print some warnings, but they seem to be irrelevant. Besides, first patch I submit to git or even to any project

Re: [PATCH 00/16] Convert parts of refs.c to struct object_id

2015-03-20 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: This is part 1 of n in converting code to use struct object_id. OK --- 'n' up there looked funny ;-) I'd like to see the series reviewed by those who recently worked heavily on the subsystem involved (namely, refs API); please do not forget

Re: [PATCH 00/16] Convert parts of refs.c to struct object_id

2015-03-20 Thread brian m. carlson
On Fri, Mar 20, 2015 at 12:52:20PM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: This is part 1 of n in converting code to use struct object_id. OK --- 'n' up there looked funny ;-) It is, unfortunately, a large task. I wish I could quantify it better

Re: [PATCH v2] t1700: make test pass with index-v4

2015-03-20 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: The different index versions have different sha-1 checksums. Those checksums are checked in t1700, which makes it fail when the test suite is run with TEST_GIT_INDEX_VERSION=4. Fix it. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- An

Re: [PATCH v2] t1700: make test pass with index-v4

2015-03-20 Thread Thomas Gummerer
On 03/20, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: The different index versions have different sha-1 checksums. Those checksums are checked in t1700, which makes it fail when the test suite is run with TEST_GIT_INDEX_VERSION=4. Fix it. Signed-off-by: Thomas

[PATCH 08/16] refs: convert for_each_ref to struct object_id

2015-03-20 Thread brian m. carlson
Convert for_each_ref, for_each_glob_ref, and for_each_glob_ref_in to use struct object_id, as the latter two call the former with the function pointer they are provided. Convert callers to refer to properly-typed functions. Convert uses of the constant 20 to GIT_SHA1_RAWSZ. Where possible,

[PATCH 09/16] refs: convert for_each_replace_ref to struct object_id

2015-03-20 Thread brian m. carlson
Update callbacks to take the proper parameters and use struct object_id elsewhere in the callbacks. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/replace.c | 14 +++--- refs.c| 4 ++-- refs.h| 2 +- replace_object.c | 4 ++-- 4 files

[PATCH 11/16] refs: convert for_each_rawref to struct object_id.

2015-03-20 Thread brian m. carlson
Convert callbacks to use struct object_id internally as well. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- builtin/branch.c | 4 ++-- builtin/describe.c | 12 ++-- builtin/for-each-ref.c | 4 ++-- builtin/fsck.c | 16 refs.c

[PATCH 07/16] revision: remove unused _oid helper.

2015-03-20 Thread brian m. carlson
Now that all the callers of handle_refs are gone, rename handle_refs_oid to handle_refs and update the callers accordingly. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- revision.c | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git

[PATCH 02/16] refs: convert for_each_tag_ref to struct object_id

2015-03-20 Thread brian m. carlson
To allow piecemeal conversion of the for_each_*_ref functions, introduce an additional typedef for a callback function that takes struct object_id * instead of unsigned char *. Provide an extra field in struct ref_entry_cb for this callback and ensure at most one is set at a time. Temporarily

[PATCH 03/16] refs: convert remaining users of for_each_ref_in to object_id

2015-03-20 Thread brian m. carlson
Remove the temporary for_each_ref_in_oid function and update the users of it. Convert the users of for_each_branch_ref and for_each_remote_ref (which use for_each_ref_in under the hood) as well. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- bisect.c| 8

Re: [PATCH 26/27] t/*svn*: fix moderate -chain breakage

2015-03-20 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: All of these cases are moderate since they would most probably not lead to missed failing tests: Either they would fail otherwise, or fail a rm in test_when_finished only. Signed-off-by: Michael J

Re: [PATCH 26/27] t/*svn*: fix moderate -chain breakage

2015-03-20 Thread Jeff King
On Fri, Mar 20, 2015 at 12:35:56PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: All of these cases are moderate since they would most probably not lead to missed failing tests: Either they would fail otherwise,

Re: [PATCH 26/27] t/*svn*: fix moderate -chain breakage

2015-03-20 Thread Jeff King
On Fri, Mar 20, 2015 at 04:02:39PM -0400, Jeff King wrote: Yeah, that was my impression, too. I don't have svn installed on my system, so I missed those ones. I don't have CVS either. That might be worth following up on. Hmm, that turned out rather easy. No breakages at all in the cvs tests.

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: ... though how would I read man pages in pdf format? I tried searching the web and all I can find is how to convert the a man page to pdf. So is there a conveniant way to tell `man` to prefer opening pdfs when available? I presume that man -Tpdf git.1

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Junio C Hamano
Thomas Schneider thosc...@gmail.com writes: Personally, I honestly am not quite sure why anybody wants to generate manpages in the PDF format like this patch does, unless they are planning to print them on paper, in which case the existing manpages (git.1 and friends) or html pages (git.html

[PATCH 0/2] fix test suite with split index

2015-03-20 Thread Thomas Gummerer
I've now tried to set the GIT_TEST_SPLIT_INDEX environment variable and run the tests, and quite a few seem to fail for both v3 and v4. I'm looking into that now, but that seems to be unrelated to index v4, and I'm not sure yet if I'm testing the right thing. So now I've tracked it down,

[PATCH 2/2] read-cache: fix reading of split index

2015-03-20 Thread Thomas Gummerer
The split index extension uses ewah bitmaps to mark index entries as deleted, instead of removing them from the index directly. This can result in an on-disk index, in which entries of stage #0 and higher stages appear, which are removed later when the index bases are merged. 15999d0

[PATCH 1/2] test-lib: allow using split index in the test suite

2015-03-20 Thread Thomas Gummerer
Allow adding a TEST_GIT_TEST_SPLIT_INDEX variable to config.mak to run the test suite with split index enabled. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- Makefile | 6 ++ t/test-lib.sh | 6 ++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Thomas Schneider
2015-03-20 22:28 GMT+01:00 Junio C Hamano gits...@pobox.com: I think you misunderstood me. I am not dismissing the need for PDF; I am just saying that there is no need to directly generate them from asciidoc sources, especially when there are already manpages and html pages available as

Re: [PATCH 1/2] test-lib: allow using split index in the test suite

2015-03-20 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: Allow adding a TEST_GIT_TEST_SPLIT_INDEX variable to config.mak to run the test suite with split index enabled. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- Hmm, it is not wrong per-se, but would it be too much trouble to do

What's cooking in git.git (Mar 2015, #07; Fri, 20)

2015-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'. Now we are almost at the end of week #6, and hopefully we can do a -rc0 late next week to start wrapping this cycle up. You can find the

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Thomas Schneider
2015-03-20 21:21 GMT+01:00 Junio C Hamano gits...@pobox.com: Stefan Beller sbel...@google.com writes: ... though how would I read man pages in pdf format? I tried searching the web and all I can find is how to convert the a man page to pdf. So is there a conveniant way to tell `man` to

Re: [PATCH 01/14] numparse: new module for parsing integral numbers

2015-03-20 Thread Eric Sunshine
On Wed, Mar 18, 2015 at 6:47 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 03/18/2015 07:27 PM, Eric Sunshine wrote: On Tuesday, March 17, 2015, Michael Haggerty mhag...@alum.mit.edu wrote: Implement wrappers for strtol() and strtoul() that are safer and more convenient to use. + * The

[PATCH 03/25] t: fix moderate -chain breakage

2015-03-20 Thread Jeff King
These are tests which are missing a link in their -chain, but in a way that probably does not effect the outcome of the test. Most of these are of the form: some_cmd actual test_cmp expect actual The main point of the test is to verify the output, and a failure in some_cmd would probably be

[PATCH 02/25] t: fix severe -chain breakage

2015-03-20 Thread Jeff King
These are tests which are missing a link in their -chain, in a location which causes a significant portion of the test to be missed (e.g., the test effectively does nothing, or consists of a long string of actions and output comparisons, and we throw away the exit code of at least one part of the

Re: [PATCH 1/2] test-lib: allow using split index in the test suite

2015-03-20 Thread Thomas Gummerer
On 03/20, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: Allow adding a TEST_GIT_TEST_SPLIT_INDEX variable to config.mak to run the test suite with split index enabled. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- Hmm, it is not wrong per-se, but would

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Stefan Beller sbel...@google.com writes: ... though how would I read man pages in pdf format? I tried searching the web and all I can find is how to convert the a man page to pdf. So is there a conveniant way to tell `man` to prefer opening pdfs when

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Stefan Beller
On Fri, Mar 20, 2015 at 1:21 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: ... though how would I read man pages in pdf format? I tried searching the web and all I can find is how to convert the a man page to pdf. So is there a conveniant way to tell

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Thomas referencing reading the man page offline, made me wonder why you wouldn't read the man pages itself as they can also be carried around offline. But the striking point is on an iPad, which doesn't offer you the convenience of a shell etc, but pdf

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-20 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: ... I'd rather be looking for man_or_pdf_when_possible git add and I could alias man_or_pdf_when_possible to a short name. The help framework can choose the backend and the format and it wouldn't be too outlandish to do git help --pdf add as

<    1   2