Re: [PATCH] revision.c: Correctly dereference interesting_cache

2015-06-19 Thread Jonathan Nieder
Hi, Stefan Beller wrote: This was introduced at b6e8a3b5 (2015-04-17, limit_list: avoid quadratic behavior from still_interesting), which also introduced the check a few lines before, which already dereferences `interesting_cache`. So at this point `interesting_cache` is guaranteed to be

Re: [PATCH v6 06/19] fsck: Report the ID of the error/warning

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 21:28, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Some legacy code has objects with non-fatal fsck issues; To enable the user to ignore those issues, let's print out the ID (e.g. when encountering missingemail, the user might want to

Re: [PATCH v6 10/19] fsck: Make fsck_tag() warn-friendly

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: When fsck_tag() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. I agree with that. But if

Re: co-authoring commits

2015-06-19 Thread Tuncer Ayaz
On Fri, Jun 19, 2015 at 8:18 PM, Jakub Narębski jna...@gmail.com wrote: On 2015-06-18 at 23:25, Tuncer Ayaz wrote: On Thu, Jun 18, 2015 at 12:52 AM, Theodore Ts'o wrote: On Wed, Jun 17, 2015 at 10:26:32PM +0200, Tuncer Ayaz wrote: [...] One could imagine some frankly, quite rare example

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Scott Schmit
On Fri, Jun 19, 2015 at 01:53:01PM -0700, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Can you think of a name for the option that is as short as `--quick` but means the same as `--connectivity-only`? No I can't. I think `--connectivity-only` is a very

Re: [PATCH v6 10/19] fsck: Make fsck_tag() warn-friendly

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 22:18, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: When fsck_tag() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to

Re: co-authoring commits

2015-06-19 Thread Jakub Narębski
On Fri, Jun 19, 2015 at 11:11 PM, Tuncer Ayaz tuncer.a...@gmail.com wrote: On Fri, Jun 19, 2015 at 8:18 PM, Jakub Narębski jna...@gmail.com wrote: [This is sent from Thunderbird news, so it should be all right] This is fine, the other one was broken. Out of curiosity what's the difference

Re: [PATCH v6 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: What would be the end-user experience if you stopped at the first error? You see an error, add an fsck.msg-id = ignore and rerun, only to find another error and rinse and repeat? Wouldn't you rather see all of them and add the ignore to cover them in

Re: [PATCH v6 14/19] fsck: Allow upgrading fsck warnings to errors

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 22:22, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: #define FSCK_FATAL -1 +#define FSCK_INFO -2 #define FOREACH_MSG_ID(FUNC) \ /* fatal errors */ \ @@ -50,15 +51,16 @@ FUNC(ZERO_PADDED_DATE, ERROR) \ /* warnings

Re: [PATCH v6 12/19] fsck: Disallow demoting grave fsck errors to warnings

2015-06-19 Thread Junio C Hamano
Ahh, I didn't see that they were not grouped by object types, features or any meaningful axis. That explains it (i.e. I can now understand why the original list was ordered differently from the final order). On Fri, Jun 19, 2015 at 2:09 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote:

Re: [PATCH v6 12/19] fsck: Disallow demoting grave fsck errors to warnings

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Some kinds of errors are intrinsically unrecoverable (e.g. errors while uncompressing objects). It does not make sense to allow demoting them to mere warnings. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c

Re: [PATCH v6 09/19] fsck: Handle multiple authors in commits specially

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 22:16, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: err = fsck_ident(buffer, commit-object, options); if (err) return err; +while (skip_prefix(buffer, author , buffer)) { +err = report(options,

Re: [PATCH v6 18/19] fsck: git receive-pack: support excluding objects from fsck'ing

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: + if (strcmp(var, receive.fsck.skiplist) == 0) { + const char *path = is_absolute_path(value) ? + value : git_path(%s, value); This either absolute or inside $GIT_DIR looks somewhat strange to me.

Re: [PATCH v6 12/19] fsck: Disallow demoting grave fsck errors to warnings

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 22:21, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Some kinds of errors are intrinsically unrecoverable (e.g. errors while uncompressing objects). It does not make sense to allow demoting them to mere warnings. Signed-off-by:

Re: [PATCH v6 06/19] fsck: Report the ID of the error/warning

2015-06-19 Thread Junio C Hamano
That ... can be made ... was not my wish but more like the way the code is structured it is possible for somebody to do such a thing easily, well done compliment ;-) The message names will have to be shown somewhere in the documentation, and in Documentation/ we try to use camelCase to show the

Re: [PATCH v6 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: When fsck_commit() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. That makes sense. Note that some

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-19 Thread Johannes Schindelin
Hi Paul, On 2015-06-19 18:15, Paul Tan wrote: On Fri, Jun 19, 2015 at 11:09 PM, Junio C Hamano gits...@pobox.com wrote: The primary thing I care about is to discourage callers of the API element am_state from touching these fields with strbuf functions. If it is char * then the would

Re: [PATCH v6 14/19] fsck: Allow upgrading fsck warnings to errors

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: #define FSCK_FATAL -1 +#define FSCK_INFO -2 #define FOREACH_MSG_ID(FUNC) \ /* fatal errors */ \ @@ -50,15 +51,16 @@ FUNC(ZERO_PADDED_DATE, ERROR) \ /* warnings */ \ FUNC(BAD_FILEMODE, WARN) \ -

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: This option avoids unpacking each and all objects, and just verifies the connectivity. That sounds like marketing ;-) Wow this does not unpack unnecessarily, wait, it needs to unpack and parse 3 out of 4 kinds of objects? Jokes aside,

Re: [PATCH v6 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-19 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 22:12, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Note that some problems are too problematic to simply ignore. For example, when the header lines are mixed up, we punt after encountering an incorrect line. Therefore, demoting

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Can you think of a name for the option that is as short as `--quick` but means the same as `--connectivity-only`? No I can't. I think `--connectivity-only` is a very good name that is unfortunately a mouthful, I agree that we need a name

Re: [PATCH v6 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: I do not think this if (err) return err; that uses the return value of report(), makes sense. As all the errors that use this pattern are isolated ones that does not break parsing of the remainder (e.g. author ident had an extra in it

Re: [PATCH v6 09/19] fsck: Handle multiple authors in commits specially

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: err = fsck_ident(buffer, commit-object, options); if (err) return err; + while (skip_prefix(buffer, author , buffer)) { + err = report(options, commit-object, FSCK_MSG_MULTIPLE_AUTHORS, invalid

Re: [PATCH] revision.c: Correctly dereference interesting_cache

2015-06-19 Thread Jeff King
On Fri, Jun 19, 2015 at 12:01:23PM -0700, Stefan Beller wrote: This was introduced at b6e8a3b5 (2015-04-17, limit_list: avoid quadratic behavior from still_interesting), which also introduced the check a few lines before, which already dereferences `interesting_cache`. So at this point

Re: [PATCH v2 12/12] refs: move the remaining ref module declarations to refs.h

2015-06-19 Thread Michael Haggerty
On 06/15/2015 08:35 PM, Jeff King wrote: On Mon, Jun 15, 2015 at 11:13:22AM -0700, Junio C Hamano wrote: @@ -78,15 +170,15 @@ typedef int each_ref_fn(const char *refname, * modifies the reference also returns a nonzero value to immediately * stop the iteration. */ -extern int

Re: [PATCH v2 08/12] initial_ref_transaction_commit(): function for initial ref creation

2015-06-19 Thread Michael Haggerty
On 06/15/2015 08:53 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: +struct ref_transaction *t; +struct strbuf err = STRBUF_INIT; + +t = ref_transaction_begin(err); +if (!t) +die(err.buf); Yikes, and sorry for sending three messages

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Jokes aside, given that you should regularly repack your repository anyway, I do not think it is such a big downside that this mode misses a corrupt objects, and the 1 out of 4 kinds of objects, i.e. blobs, occupy major part of the

Re: [PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Junio C Hamano
Scott Schmit i.g...@comcast.net writes: On Fri, Jun 19, 2015 at 01:53:01PM -0700, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Can you think of a name for the option that is as short as `--quick` but means the same as `--connectivity-only`? No I can't.

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Alexander Kuleshov
Hello Jeff and Junio, Thank you for feedback and help. I think also I need to add yet another test which tests case when configuration option is set and -o passed. I'll make changes and resend the patch. Thank you. 2015-06-19 10:14 GMT+06:00 Jeff King p...@peff.net: On Thu, Jun 18, 2015 at

Re: [PATCH] Improve contrib/diff-highlight to highlight unevenly-sized hunks

2015-06-19 Thread Jeff King
On Fri, Jun 19, 2015 at 01:32:23AM -0400, Jeff King wrote: The least-work thing may actually be teaching the separate diff-highlight script to strip out the colorizing and re-add it by offset. OK, here is that patch. It seems to work OK, and should preserve existing colors produced by git

Re: [PATCH/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-19 Thread Matthieu Moy
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Cool. Then almost all the work is done to get an automated test. Next step would be to add the tests itself in the code. I would do that by adding a hidden --selfcheck option to git

Re: Bug report: Unhandled Exception

2015-06-19 Thread Johannes Schindelin
Hi Gary, On 2015-06-11 21:21, Gary England wrote: Using git version 1.9.2-preview20140411, in Git Bash for Windows, performing a git pull --rebase, received an unhandled exception. Please note that the newest 1.9.x release is 1.9.5. Could you re-test with that version, please? Or maybe you

[PATCH v6 09/19] fsck: Handle multiple authors in commits specially

2015-06-19 Thread Johannes Schindelin
This problem has been detected in the wild, and is the primary reason to introduce an option to demote certain fsck errors to warnings. Let's offer to ignore this particular problem specifically. Technically, we could handle such repositories by setting receive.fsck.msg-id to

[PATCH v6 13/19] fsck: Optionally ignore specific fsck issues completely

2015-06-19 Thread Johannes Schindelin
An fsck issue in a legacy repository might be so common that one would like not to bother the user with mentioning it at all. With this change, that is possible by setting the respective message type to ignore. This change abuses the missingemail=warn test to verify that ignore is also accepted

[PATCH v6 10/19] fsck: Make fsck_tag() warn-friendly

2015-06-19 Thread Johannes Schindelin
When fsck_tag() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. Just like fsck_commit(), there are certain problems that could hide other issues with the same tag

[PATCH 3/3] Add filter-objects command

2015-06-19 Thread Charles Bailey
From: Charles Bailey cbaile...@bloomberg.net filter-objects is a command to scan all objects in the object database for the repository and print the ids of those which match the given criteria. The current supported criteria are object type and the minimum size of the object. The guiding use

Re: [PATCH/WIP v3 03/31] am: implement skeletal builtin am

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 4:26 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: @@ -0,0 +1,28 @@ +/* + * Builtin git am + * + * Based on git-am.sh by Junio C Hamano. + */ +#include cache.h +#include builtin.h +#include exec_cmd.h + +int cmd_am(int argc,

Re: [PATCH v4 00/19] Make git-pull a builtin

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 4:13 AM, Junio C Hamano gits...@pobox.com wrote: I didn't look carefully, but does that mean 04/19 has the what if you start from a subdirectory and are still using the scripted one? issue we discussed recently for am? It does, but git-pull.sh does not care about the

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Alexander Kuleshov
2015-06-19 3:46 GMT+06:00 Junio C Hamano gits...@pobox.com: I agree with later -o should override an earlier one, but I do not necessarily agree with '-o -' should be --stdout, for a simple reason that -o foo is not --stdout foo. Perhaps something like this to replace builtin/ part of

[PATCH v6 03/19] fsck: Provide a function to parse fsck message IDs

2015-06-19 Thread Johannes Schindelin
These functions will be used in the next commits to allow the user to ask fsck to handle specific problems differently, e.g. demoting certain errors to warnings. The upcoming `fsck_set_msg_types()` function has to handle partial strings because we would like to be able to parse, say,

[PATCH v6 04/19] fsck: Offer a function to demote fsck errors to warnings

2015-06-19 Thread Johannes Schindelin
There are legacy repositories out there whose older commits and tags have issues that prevent pushing them when 'receive.fsckObjects' is set. One real-life example is a commit object that has been hand-crafted to list two authors. Often, it is not possible to fix those issues without disrupting

[PATCH v6 17/19] fsck: Introduce `git fsck --quick`

2015-06-19 Thread Johannes Schindelin
This option avoids unpacking each and all objects, and just verifies the connectivity. In particular with large repositories, this speeds up the operation, at the expense of missing corrupt blobs and ignoring unreachable objects, if any. Signed-off-by: Johannes Schindelin

[PATCH v6 15/19] fsck: Document the new receive.fsck.msg-id options

2015-06-19 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 14 ++ 1 file changed, 14 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 3e37b93..306ab7a 100644 --- a/Documentation/config.txt +++

[PATCH v6 19/19] fsck: support ignoring objects in `git fsck` via fsck.skiplist

2015-06-19 Thread Johannes Schindelin
Identical to support in `git receive-pack for the config option `receive.fsck.skiplist`, we now support ignoring given objects in `git fsck` via `fsck.skiplist` altogether. This is extremely handy in case of legacy repositories where it would cause more pain to change incorrect objects than to

[PATCH v6 18/19] fsck: git receive-pack: support excluding objects from fsck'ing

2015-06-19 Thread Johannes Schindelin
The optional new config option `receive.fsck.skiplist` specifies the path to a file listing the names, i.e. SHA-1s, one per line, of objects that are to be ignored by `git receive-pack` when `receive.fsckObjects = true`. This is extremely handy in case of legacy repositories where it would cause

Re: [msysGit] crlf issues

2015-06-19 Thread Johannes Schindelin
Hi Rusi, Cc:ing the main Git list, as some of this has been discussed at the GitMerge in Paris, and some participants of that discussion might want to join this thread. On 2015-06-19 14:55, Rusi Mody wrote: Trying to setup git. Majority folks are MS VS users but also some *nixers. My

Re: Bug report: Unhandled Exception

2015-06-19 Thread Johannes Schindelin
Hi Gary, On 2015-06-19 16:09, Gary England wrote: Will do. It's unlikely that I'll be able to reproduce the error. But, in the event that it happens again, I'll let you know. For the record, the problem usually lies with a certain implementation detail on 32-bit only (if you know the

[PATCH v6 00/19] Introduce an internal API to interact with the fsck machinery

2015-06-19 Thread Johannes Schindelin
At the moment, the git-fsck's integrity checks are targeted toward the end user, i.e. the error messages are really just messages, intended for human consumption. Under certain circumstances, some of those errors should be allowed to be turned into mere warnings, though, because the cost of

Re: [PATCH v2 05/12] delete_refs(): improve error message

2015-06-19 Thread Michael Haggerty
On 06/15/2015 08:29 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: Subject: Re: [PATCH v2 05/12] delete_refs(): improve error message I'd call this make error message more generic. Change the error message from Could not remove branch %s to could

[PATCH v6 02/19] fsck: Introduce identifiers for fsck messages

2015-06-19 Thread Johannes Schindelin
Instead of specifying whether a message by the fsck machinery constitutes an error or a warning, let's specify an identifier relating to the concrete problem that was encountered. This is necessary for upcoming support to be able to demote certain errors to warnings. In the process, simplify the

[PATCH v6 05/19] fsck (receive-pack): Allow demoting errors to warnings

2015-06-19 Thread Johannes Schindelin
For example, missing emails in commit and tag objects can be demoted to mere warnings with git config receive.fsck.missingemail=warn The value is actually a comma-separated list. In case that the same key is listed in multiple receive.fsck.msg-id lines in the config, the latter

[PATCH v6 06/19] fsck: Report the ID of the error/warning

2015-06-19 Thread Johannes Schindelin
Some legacy code has objects with non-fatal fsck issues; To enable the user to ignore those issues, let's print out the ID (e.g. when encountering missingemail, the user might want to call `git config --add receive.fsck.missingemail=warn`). Signed-off-by: Johannes Schindelin

[PATCH v6 07/19] fsck: Make fsck_ident() warn-friendly

2015-06-19 Thread Johannes Schindelin
When fsck_ident() identifies a problem with the ident, it should still advance the pointer to the next line so that fsck can continue in the case of a mere warning. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 49 +++-- 1

[PATCH v6 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-19 Thread Johannes Schindelin
When fsck_commit() identifies a problem with the commit, it should try to make it possible to continue checking the commit object, in case the user wants to demote the detected errors to mere warnings. Note that some problems are too problematic to simply ignore. For example, when the header

[PATCH v6 11/19] fsck: Add a simple test for receive.fsck.msg-id

2015-06-19 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- t/t5504-fetch-receive-strict.sh | 21 + 1 file changed, 21 insertions(+) diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index 69ee13c..3f7e96a 100755 ---

[PATCH v6 12/19] fsck: Disallow demoting grave fsck errors to warnings

2015-06-19 Thread Johannes Schindelin
Some kinds of errors are intrinsically unrecoverable (e.g. errors while uncompressing objects). It does not make sense to allow demoting them to mere warnings. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 14 --

[PATCH v6 14/19] fsck: Allow upgrading fsck warnings to errors

2015-06-19 Thread Johannes Schindelin
The 'invalid tag name' and 'missing tagger entry' warnings can now be upgraded to errors by specifying `invalidtagname` and `missingtaggerentry` in the receive.fsck.msg-id config setting. Incidentally, the missing tagger warning is now really shown as a warning (as opposed to being reported with

[PATCH v6 16/19] fsck: Support demoting errors to warnings

2015-06-19 Thread Johannes Schindelin
We already have support in `git receive-pack` to deal with some legacy repositories which have non-fatal issues. Let's make `git fsck` itself useful with such repositories, too, by allowing users to ignore known issues, or at least demote those issues to mere warnings. Example: `git -c

Re: Bug report: Unhandled Exception

2015-06-19 Thread Gary England
Hi Johannes, Will do. It's unlikely that I'll be able to reproduce the error. But, in the event that it happens again, I'll let you know. Thanks, Gary From: Johannes Schindelin johannes.schinde...@gmx.de Sent: Friday, June 19, 2015 6:58 AM To: Gary

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-19 Thread Duy Nguyen
On Fri, Jun 19, 2015 at 5:50 PM, Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr wrote: Duy Nguyen pclo...@gmail.com writes: + sb.buf[0] = 'Z'; + printf(%c\n, strbuf_slopbuf[0]); + return 0; startup_info = git_startup_info; I might be wrong, but I definitely think that this

Re: [PATCH 3/3] Add filter-objects command

2015-06-19 Thread Jeff King
On Fri, Jun 19, 2015 at 11:33:24AM +0100, Charles Bailey wrote: Obviously I've glossed over the how to get a list of objects part. If you truly want all objects (not just reachable ones), or if rev-list --objects is too slow [...] So, yes, performance is definitely an issue and I could

Re: [PATCH 3/3] Add filter-objects command

2015-06-19 Thread John Keeping
On Fri, Jun 19, 2015 at 11:33:24AM +0100, Charles Bailey wrote: So, yes, performance is definitely an issue and I could have called this command git magically-generate-all-object-for-scripts but then, as it was so easy to provide exactly the filtering that I was looking for in the C code, I

Re: Using clean/smudge filters with difftool

2015-06-19 Thread John Keeping
On Fri, Jun 19, 2015 at 10:57:55AM +0200, Michael J Gruber wrote: Junio C Hamano venit, vidit, dixit 19.06.2015 00:55: John Keeping j...@keeping.me.uk writes: I think the summary is that there are some scenarios where the external diff tool should see the smudged version and others where

Re: [PATCH 3/3] Add filter-objects command

2015-06-19 Thread Charles Bailey
On Fri, Jun 19, 2015 at 06:10:10AM -0400, Jeff King wrote: On Fri, Jun 19, 2015 at 10:10:59AM +0100, Charles Bailey wrote: filter-objects is a command to scan all objects in the object database for the repository and print the ids of those which match the given criteria. The current

Re: [PATCH 2/3] Move unsigned long option parsing out of pack-objects.c

2015-06-19 Thread Remi Galan Alfonso
Charles Bailey cbaile...@bloomberg.net writes: test_expect_success 'long options' ' - test-parse-options --boolean --integer 1729 --boolean --string2=321 \ - --verbose --verbose --no-dry-run --abbrev=10 --file fi.le\ - --obsolete output 2 output.err + test-parse-options --boolean --integer

Re: [PATCH 2/3] Move unsigned long option parsing out of pack-objects.c

2015-06-19 Thread Charles Bailey
On Fri, Jun 19, 2015 at 01:03:25PM +0200, Remi Galan Alfonso wrote: It's trivial matter but the line: + output 2 output.err should be written: + output 2output.err It was incorrectly written before but since you are modifying the line, it might be a good thing to change it now.

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 4:43 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: diff --git a/builtin/am.c b/builtin/am.c index dbc8836..af68c51 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -6,6 +6,158 @@ #include cache.h #include builtin.h #include

Re: [PATCH] Improve contrib/diff-highlight to highlight unevenly-sized hunks

2015-06-19 Thread Jeff King
On Fri, Jun 19, 2015 at 03:34:55AM -0400, Jeff King wrote: And here's some more bad news. If you look at the diff for this patch itself, it's terribly unreadable (the regular diff already is pretty bad, but the highlights make it much worse). There are big chunks where we take away 5 or 10

Re: [PATCH/WIP v3 10/31] am: refresh the index at start

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 5:28 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: If a file is unchanged but stat-dirty, git-apply may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. As such, since 2a6f08a (am: refresh the

Re: git svn die signal 6

2015-06-19 Thread Олег Кохтенко
I even found Pull Request on GitHub with useful changes, but looks like there is too hard way to commit changes and author gave up. https://github.com/git/git/pull/62 Probably you can take a short look into it and include this changes in next release. 2015-06-15 16:54 GMT+03:00 Олег Кохтенко

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 5:10 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: + /* commit message and metadata */ + struct strbuf author_name; + struct strbuf author_email; + struct strbuf author_date; + struct strbuf msg; Same comment as

Re: Visualizing merge conflicts after the fact (using kdiff3)

2015-06-19 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 18.06.2015 17:57: Michael J Gruber g...@drmicha.warpmail.net writes: This type of request comes up often (for a reason). I'm wondering whether we could support it more systematically, either by exposing the steps above as a command, or by storing the

[PATCH] mergetool-lib: fix default tool selection

2015-06-19 Thread Michael J Gruber
When no diff nor merge tool is specified (config, option), mergetool-lib is supposed to choose a default tool from a set of tools. That set is constructed dynamically depending on the environment (graphical, editor setting) as a space separated string of tool names. 719518f (mergetool--lib: set

[PATCH 2/3] Move unsigned long option parsing out of pack-objects.c

2015-06-19 Thread Charles Bailey
From: Charles Bailey cbaile...@bloomberg.net The unsigned long option parsing (including 'k'/'m'/'g' suffix parsing) is more widely applicable. Add support for OPT_ULONG to parse-options.h and change pack-objects.c use this support. Signed-off-by: Charles Bailey cbaile...@bloomberg.net ---

Improvements to parse-options and a new filter-objects command

2015-06-19 Thread Charles Bailey
In my team we've been looking for a fast way to check a large number of repositories for large files, which are typically unintentionally checked in binaries, so that we can warn repository owners and help them tidy up as desired. There seem to be two main approaches to scripting this. The first

[PATCH 1/3] Correct test-parse-options to handle negative ints

2015-06-19 Thread Charles Bailey
From: Charles Bailey cbaile...@bloomberg.net Fix the printf specification to treat 'integer' as the signed type that it is and add a test that checks that we parse negative option arguments. Signed-off-by: Charles Bailey cbaile...@bloomberg.net --- t/t0040-parse-options.sh | 2 ++

Re: Using clean/smudge filters with difftool

2015-06-19 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 19.06.2015 00:55: John Keeping j...@keeping.me.uk writes: I think the summary is that there are some scenarios where the external diff tool should see the smudged version and others where the clean version is more appropriate and Git should support both

Re: [PATCH] strbuf: stop out-of-boundary warnings from Coverity

2015-06-19 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Anyway it does not put strbuf_slopbuf in .rodata. That's sad. I wa hoping that it would behave the same as this, which does give me SEGV: #include stdio.h static const char x = '\0'; static char *y = (char *)x; int main (void) { *y = 1; } -- To

Re: Using clean/smudge filters with difftool

2015-06-19 Thread Florian Aspart
2015-06-19 11:32 GMT+02:00 John Keeping j...@keeping.me.uk: On Fri, Jun 19, 2015 at 10:57:55AM +0200, Michael J Gruber wrote: Junio C Hamano venit, vidit, dixit 19.06.2015 00:55: John Keeping j...@keeping.me.uk writes: I think the summary is that there are some scenarios where the external

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 11:09 PM, Junio C Hamano gits...@pobox.com wrote: You do realize that strbuf internally does alloc/free so as a solution to fragmentation issue you are at the mercy of the same alloc/free, don't you? Yes, of course, but it has the alloc variable to keep track of the size

Re: Using clean/smudge filters with difftool

2015-06-19 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Now, since external diff runs on smudged blobs, it appears as if we mixed cleaned and smudged blobs when feeding external diffs; whereas really, we mix worktree blobs and smudged repo blobs, which is okay as per our definition of

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: 2015-06-19 3:46 GMT+06:00 Junio C Hamano gits...@pobox.com: I agree with later -o should override an earlier one, but I do not necessarily agree with '-o -' should be --stdout, for a simple reason that -o foo is not --stdout foo. Perhaps

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-19 Thread Junio C Hamano
Paul Tan pyoka...@gmail.com writes: On Fri, Jun 19, 2015 at 5:10 AM, Junio C Hamano gits...@pobox.com wrote: Paul Tan pyoka...@gmail.com writes: + /* commit message and metadata */ + struct strbuf author_name; + struct strbuf author_email; + struct strbuf author_date; +

Re: Visualizing merge conflicts after the fact (using kdiff3)

2015-06-19 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 18.06.2015 17:57: Perhaps 'tr/remerge-diff' (on 'pu') is of interest? I haven't reviewed remerge-diff but merged it on top of my own local additions and ran the full test suite successfully. Any big

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Alexander Kuleshov
I thought I made that if we did not see '-o dir' on the command line, initialize output_directory to what we read from the config before we make a call to set_outdir(). What I am missing? Puzzled... FWIW, IIRC, the patch you are responding to passed the test you added. Ok, Now we have:

Re: [PATCH] Improve contrib/diff-highlight to highlight unevenly-sized hunks

2015-06-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: I do strip it off, so it is OK for it to be different in both the pre-image and post-image. But what I can't tolerate is the intermingling with actual data: +\t\t\x1b[32m;foo +\t\x1b[32m;bar I think that depends on the definition of strip it off ;-)

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Junio C Hamano
Alexander Kuleshov kuleshovm...@gmail.com writes: Ah, you mean to put this check before. I am fuzzy what you mean before (or after); the how about doing it this way instead? patch we are discussing is to replace the change you did in your original, so if you apply it you would know what

Re: [PATCH 3/3] Add filter-objects command

2015-06-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: Right, my point was only that it works for _your_ particular filter, but it would be nice to have something more general. And we already have cat-file --batch-check. IOW, I think I would prefer the magical form because it's a better scripting building block.

Re: [PATCH v5 00/19] Introduce an internal API to interact with the fsck machinery

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: I basically made up names on the go, based on the messages. Some of the questionable groups are: BAD_DATE DATE_OVERFLOW I guess it should be BAD_DATE_OVERFLOW to be more consistent? I am not sure about consistency, but surely a

Re: [PATCH] mergetool-lib: fix default tool selection

2015-06-19 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: When no diff nor merge tool is specified (config, option), mergetool-lib is supposed to choose a default tool from a set of tools. That set is constructed dynamically depending on the environment (graphical, editor setting) as a space

Re: [PATCH] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Alexander Kuleshov
Ah, you mean to put this check before. Just tested it and many tests are broken. Will look on it now 2015-06-19 23:19 GMT+06:00 Alexander Kuleshov kuleshovm...@gmail.com: I thought I made that if we did not see '-o dir' on the command line, initialize output_directory to what we read from the

Re: co-authoring commits

2015-06-19 Thread Jakub Narębski
On 2015-06-18 at 23:25, Tuncer Ayaz wrote: On Thu, Jun 18, 2015 at 12:52 AM, Theodore Ts'o wrote: On Wed, Jun 17, 2015 at 10:26:32PM +0200, Tuncer Ayaz wrote: [...] One could imagine some frankly, quite rare example where there is a team of people who votes on each commit before it gets sent

Re: [PATCH 1/3] Correct test-parse-options to handle negative ints

2015-06-19 Thread Junio C Hamano
Charles Bailey char...@hashpling.org writes: From: Charles Bailey cbaile...@bloomberg.net Fix the printf specification to treat 'integer' as the signed type that it is and add a test that checks that we parse negative option arguments. Signed-off-by: Charles Bailey cbaile...@bloomberg.net

[PATCH v2] format-patch: introduce format.outputDirectory configuration

2015-06-19 Thread Alexander Kuleshov
We can pass -o/--output-directory to the format-patch command to store patches not in the working directory. This patch introduces format.outputDirectory configuration option for same purpose. The case of usage of this configuration option can be convinience to not pass everytime

Re: [PATCH v6 04/19] fsck: Offer a function to demote fsck errors to warnings

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: diff --git a/fsck.c b/fsck.c index da5717c..8c3caff 100644 --- a/fsck.c +++ b/fsck.c @@ -103,13 +103,85 @@ static int fsck_msg_type(enum fsck_msg_id msg_id, { int msg_type; - msg_type = msg_id_info[msg_id].msg_type; -

Re: [PATCH v6 06/19] fsck: Report the ID of the error/warning

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: Some legacy code has objects with non-fatal fsck issues; To enable the user to ignore those issues, let's print out the ID (e.g. when encountering missingemail, the user might want to call `git config --add

Re: [PATCH v5 00/19] Introduce an internal API to interact with the fsck machinery

2015-06-19 Thread Johannes Schindelin
Hi Junio, first of all: the improvements discussed here are already part of v6. On 2015-06-19 19:33, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: I basically made up names on the go, based on the messages. Some of the questionable groups are: BAD_DATE

Re: [PATCH v6 07/19] fsck: Make fsck_ident() warn-friendly

2015-06-19 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: When fsck_ident() identifies a problem with the ident, it should still advance the pointer to the next line so that fsck can continue in the case of a mere warning. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de ---

Re: [PATCH 2/3] Move unsigned long option parsing out of pack-objects.c

2015-06-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Except for the minor nits above, I think this is a good change. Oh, I forgot to mention one thing. I am not sure if this should be called ULONG. unsigned long-ness is not the most important part of this thing from the end-user's point of view, and also

Re: [PATCH 2/3] Move unsigned long option parsing out of pack-objects.c

2015-06-19 Thread Jakub Narębski
W dniu 2015-06-19 o 19:58, Junio C Hamano pisze: Charles Bailey char...@hashpling.org writes: [...] +if (!git_parse_ulong(arg, opt-value)) +return opterror(opt, expects a numerical value, flags); This used to be: -die(_(unable to parse value

  1   2   >