[PATCH v2 03/18] fsck: Provide a function to parse fsck message IDs

2015-01-19 Thread Johannes Schindelin
. To make the parsing robust, we generate strings from the enum keys, and using these keys, we will map lower-case, dash-separated strings values to the corresponding enum values. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 27 +-- 1 file changed

[PATCH v2 05/18] fsck: Allow demoting errors to warnings via receive.fsck.warn = key

2015-01-19 Thread Johannes Schindelin
receive.fsck.* lines in the config, the latter configuration wins. As git receive-pack does not actually perform the checks, it hands off the setting to index-pack or unpack-objects in the form of an optional argument to the --strict option. Signed-off-by: Johannes Schindelin johannes.schinde

[PATCH v2 15/18] fsck: Document the new receive.fsck.* options.

2015-01-19 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 25 + 1 file changed, 25 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index ae6791d..7371a5f 100644 --- a/Documentation/config.txt +++ b

[PATCH v2 16/18] fsck: Support demoting errors to warnings

2015-01-19 Thread Johannes Schindelin
receive.fsckObjects = true, for example – we strictly separate the fsck.* from the receive.fsck.* settings. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 13 + builtin/fsck.c | 15 +++ t/t1450-fsck.sh | 11 +++ 3

[PATCH v2 11/18] fsck: Add a simple test for receive.fsck.*

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

[PATCH v2 10/18] fsck: Make fsck_tag() warn-friendly

2015-01-19 Thread Johannes Schindelin
object. For example, if the 'type' line is not encountered in the correct position, the 'tag' line – if there is any – would not be handled at all. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fsck.c

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2015-01-22 Thread Johannes Schindelin
Hi Michael, On 2015-01-22 16:49, Michael Haggerty wrote: On 12/23/2014 06:14 PM, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On Tue, 23 Dec 2014, Junio C Hamano wrote: I suspect that it would be much better if the configuration variables were organized

Re: Git compile warnings (under mac/clang)

2015-01-22 Thread Johannes Schindelin
Hi Stefan, On 2015-01-22 20:59, Stefan Beller wrote: cc Johannes Schindelin johannes.schinde...@gmx.de who is working in the fsck at the moment On Thu, Jan 22, 2015 at 11:43 AM, Michael Blume blume.m...@gmail.com wrote: CC fsck.o fsck.c:110:38: warning: comparison of unsigned enum

Re: [msysGit] Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Johannes Schindelin
Hi, On 2015-02-12 20:48, Junio C Hamano wrote: Karsten Blees karsten.bl...@gmail.com writes: This patch series was inspired by the problem that Git does not detect changed file content if st_size, st_mtime and st_ctime are unchanged. This was apparently caused by VSS2Git resetting mtime to

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2015-01-31 Thread Johannes Schindelin
Hi Michael Junio, On 2015-01-22 18:17, Johannes Schindelin wrote: [...] we need to avoid confusing settings such as ``` [receive.fsck] warn = missing-tagger-entry error = missing-tagger-entry ``` I *think* I found a solution. Please let me recapitulate quickly the problem

[PATCH v4 01/19] fsck: Introduce fsck options

2015-01-31 Thread Johannes Schindelin
Just like the diff machinery, we are about to introduce more settings, therefore it makes sense to carry them around as a (pointer to a) struct containing all of them. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- builtin/fsck.c | 20 +-- builtin/index-pack.c

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

2015-01-31 Thread Johannes Schindelin
. To make the parsing robust, we generate strings from the enum keys, and using these keys, we will map lower-case, dash-separated strings values to the corresponding enum values. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 27 +-- 1 file changed

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

2015-01-31 Thread Johannes Schindelin
severity levels. Besides, we want to introduce a parser in the next commit that maps the string representation to the enum value, hence we use the slightly ugly preprocessor construct that is extensible for use with said parser. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de

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

2015-01-31 Thread Johannes Schindelin
possibly overriding each other partially; interdiff below the diffstat. Johannes Schindelin (19): fsck: Introduce fsck options fsck: Introduce identifiers for fsck messages fsck: Provide a function to parse fsck message IDs fsck: Offer a function to demote fsck errors to warnings fsck

[PATCH v4 05/19] fsck: Allow demoting errors to warnings

2015-01-31 Thread Johannes Schindelin
. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- builtin/index-pack.c | 4 builtin/receive-pack.c | 13 +++-- builtin/unpack-objects.c | 5 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index

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

2015-01-31 Thread Johannes Schindelin
lines are mixed up, we punt after encountering an incorrect line. Therefore, demoting certain warnings to errors can hide other problems. Example: demoting the missing-author error to a warning would hide a problematic committer line. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de

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

2015-01-31 Thread Johannes Schindelin
with the error: prefix, as it used to be the case before this commit). Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c| 24 +--- t/t5302-pack-index.sh | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/fsck.c b

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

2015-01-31 Thread Johannes Schindelin
=warn, but that could hide missing tree objects in the same commit because we cannot continue verifying any commit object after encountering a missing committer line, while we can continue in the case of multiple author lines. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c

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

2015-01-31 Thread Johannes Schindelin
. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 70 +++--- fsck.h | 7 +-- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/fsck.c b/fsck.c index 2d91e28..b5e7d2c 100644 --- a/fsck.c +++ b

[PATCH v4 11/19] fsck: Add a simple test for receive.fsck.severity

2015-01-31 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..9d49cb7 100755 --- a/t/t5504-fetch-receive

[PATCH v4 15/19] fsck: Document the new receive.fsck.severity options.

2015-01-31 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 15 +++ 1 file changed, 15 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index ae6791d..f893492 100644 --- a/Documentation/config.txt +++ b/Documentation

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

2015-01-31 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 | 13 +++-- t/t5504-fetch

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

2015-01-31 Thread Johannes Schindelin
object. For example, if the 'type' line is not encountered in the correct position, the 'tag' line – if there is any – would not be handled at all. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fsck.c

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

2015-01-31 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 v4 18/19] fsck: git receive-pack: support excluding objects from fsck'ing

2015-01-31 Thread Johannes Schindelin
' SHA-1 to a (preferably sorted) file when the objects are legitimate, i.e. when it is determined that those problematic objects should be allowed to enter the server. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt| 7 ++ builtin/receive-pack.c

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

2015-01-31 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 johannes.schinde

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

2015-01-31 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 missing-email, the user might want to call `git config --add receive.fsck.severity missing-email=warn`). Signed-off-by: Johannes Schindelin

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

2015-01-31 Thread Johannes Schindelin
and works correctly. And while at it, it makes sure that multiple options work, too (they are passed to unpack-objects or index-pack as a comma-separated list via the --strict=... command-line option). Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 5

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

2015-01-31 Thread Johannes Schindelin
to live with them (e.g. a duplicate 'author' line in an early commit object). Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 7 +++ builtin/fsck.c | 10 ++ 2 files changed, 17 insertions(+) diff --git a/Documentation/config.txt b

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

2015-01-31 Thread Johannes Schindelin
receive.fsckObjects = true, for example – we strictly separate the fsck.severity from the receive.fsck.severity settings. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- Documentation/config.txt | 12 builtin/fsck.c | 12 t/t1450-fsck.sh

Re: Git compile warnings (under mac/clang)

2015-01-23 Thread Johannes Schindelin
Hi Peff, On 2015-01-22 23:01, Jeff King wrote: On Thu, Jan 22, 2015 at 10:20:01PM +0100, Johannes Schindelin wrote: On 2015-01-22 20:59, Stefan Beller wrote: cc Johannes Schindelin johannes.schinde...@gmx.de who is working in the fsck at the moment On Thu, Jan 22, 2015 at 11:43 AM

Re: [msysGit] Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-24 Thread Johannes Schindelin
On 2015-01-23 22:24, Torsten Bögershausen wrote: [...] either to always switch off SANITY for CYGWIN (or Windows in general). Nice one! You gave me the chuckle for the day ;-) Ciao, Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2] receive-pack: support push-to-checkout hook

2015-01-09 Thread Johannes Schindelin
Hi Junio, On Thu, 8 Jan 2015, Junio C Hamano wrote: * This is an update to $gmane/260527; relative to what I have been keeping in 'pu', the only difference is that it comes with documentation updates. Thanks, it is very nice! Dscho -- To unsubscribe from this list: send the line

Re: [PATCH] standardize usage info string format

2015-01-08 Thread Johannes Schindelin
Hi Alex, [somehow my mailer did not like the Cc: list, so I had to cull it] On Wed, 7 Jan 2015, Alex Henrie wrote: This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Junio, On Wed, 7 Jan 2015, Junio C Hamano wrote: Dscho, this sounds to me like the additional 8.3 ambiguity protection (which is only in Git for Windows) in action. Any thoughts? First thought: the Git for Windows mailing list should be Cc:ed (I was traveling yesterday and somebody else

Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Peff, On Thu, 8 Jan 2015, Jeff King wrote: On Thu, Jan 08, 2015 at 11:06:18AM +0100, Johannes Schindelin wrote: ICON~714.PNG is a valid short name for a long name (such as 'icon.background.png') because it fits the shortening scheme (8.3 format, the base name ends in ~n). As this can

Re: [msysGit] Re: Probably a bug with ~ symbol in filenames on Windows 7 x64 in git 1.9.5

2015-01-08 Thread Johannes Schindelin
Hi Torsten, On Thu, 8 Jan 2015, Torsten Bögershausen wrote: There is something more then just the tilde protection going on, [...] Indeed. What is going on is that you build Git yourself, from git.git, while Dmitry obviously used Git for Windows -- which carries a couple of patches on top of

RE: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-18 Thread Johannes Schindelin
Hi Stephen, On 2015-03-18 09:38, Stephen Robin wrote: Paul Tan writes: I would like to share this very rough prototype with everyone. ... I started this as a just-for-fun exercise to learn about the git internal API I started to rewrite git-pull for similar reasons a couple of months ago,

Re: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-18 Thread Johannes Schindelin
Hi Paul, thank you for this very detailed mail. It was a real pleasure to read this well-researched document. In the following, I will pick out only parts from the mail, in the interest of both of our time. Please assume that I agree with everything that I do not quote below (and even the

Re: [GSoC] Applying for conversion scripts to builtins

2015-03-17 Thread Johannes Schindelin
Hi Paul, On 2015-03-17 01:22, Paul Tan wrote: On Tue, Mar 17, 2015 at 12:49 AM, Yurii Shevtsov unge...@gmail.com wrote: Generally, it would be easy to convert any shell script to C by just using the run_command* functions (and in less lines of code), but that would not be taking advantage

Re: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-21 Thread Johannes Schindelin
Hi Paul, On 2015-03-21 15:00, Paul Tan wrote: Thanks for your suggestions, I agree with most of them :). On Wed, Mar 18, 2015 at 5:00 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: +static int parse_opt_rebase(const struct option *opt, const char *arg, int unset

Re: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-21 Thread Johannes Schindelin
Hi Paul, On 2015-03-21 14:23, Paul Tan wrote: Thanks for the review, though I would like to work on the proposal now before the deadline passes :) That makes sense. On Thu, Mar 19, 2015 at 1:52 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Paul Tan pyoka...@gmail.com writes:

Re: [msysGit] Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-25 Thread Johannes Schindelin
Hi Duy, On 2015-03-25 01:46, Duy Nguyen wrote: On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley philipoak...@iee.org wrote: That said, the final error (which I'd missed in the earlier post) is: fatal: make_cache_entry failed for path 'ifcfg-eth0:0' This is on the Windows (pre-compiled msysgit

Re: Trying to push into empty repo, get fatal: bad revision 'HEAD'

2015-04-01 Thread Johannes Schindelin
Hi Samuel Junio, On 2015-04-01 03:36, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Samuel Williams space.ship.travel...@gmail.com writes: I would expect if you push to an empty repo, it would update it (because denyCurrentBranch = updateInstead). Good finding. I

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Junio, On 2015-02-24 19:25, Junio C Hamano wrote: On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: About the proposal: The idea of this project is to dive into the Git source code and convert, say, git-add--interactive.perl and/or git stash into

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-25 Thread Johannes Schindelin
Hi Duy, On 2015-02-25 11:02, Duy Nguyen wrote: On Wed, Feb 25, 2015 at 6:56 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: To get an idea, I counted the lines of code written by the student I mentored last year: $ git log --author tanay...@gmail.com -p | diffstat -s 43 files

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-25 Thread Johannes Schindelin
Hi Matthieu, On 2015-02-25 11:25, Matthieu Moy wrote: - Original Message - On 2015-02-24 13:28, Jeff King wrote: On Tue, Feb 24, 2015 at 01:25:32PM +0100, Johannes Schindelin wrote: Thanks! No rush, as we are not even accepted yet, but you can create a profile

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Peff, On 2015-02-18 20:32, Jeff King wrote: On Wed, Feb 18, 2015 at 02:14:17PM -0500, Jeff King wrote: The response to my previous email was not overwhelming, but people did express some interest in Git doing GSoC this year. So I've started on the application, using last year's version

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-24 Thread Johannes Schindelin
Hi Peff, On 2015-02-24 13:06, Jeff King wrote: On Tue, Feb 24, 2015 at 01:01:17PM +0100, Johannes Schindelin wrote: After considerable consideration, I am offering to mentor Windows-related projects (into which I count conversion of scripts into builtins). Thanks! No rush, as we

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-25 Thread Johannes Schindelin
Hi Peff, On 2015-02-24 13:28, Jeff King wrote: On Tue, Feb 24, 2015 at 01:25:32PM +0100, Johannes Schindelin wrote: Thanks! No rush, as we are not even accepted yet, but you can create a profile at: http://google-melange.com and ask to join the git project as a mentor. I guess

Re: [msysGit] Re: [RFH] GSoC 2015 application

2015-02-25 Thread Johannes Schindelin
Hi Matthieu, On 2015-02-25 00:56, Matthieu Moy wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-02-24 19:25, Junio C Hamano wrote: On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: About the proposal: The idea of this project

Re: Git compile warnings (under mac/clang)

2015-01-23 Thread Johannes Schindelin
Hi Peff, On 2015-01-23 13:23, Jeff King wrote: On Fri, Jan 23, 2015 at 12:48:29PM +0100, Johannes Schindelin wrote: Pointed out by Michael Blume. Jeff King provided the pointer to a commit fixing the same issue elsewhere in the Git source code. It may be useful to reference

Re: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-23 Thread Johannes Schindelin
Hi Paul, On 2015-03-22 18:39, Paul Tan wrote: The code coverage tools can help here as well. The kcov output clearly shows which options of git-pull are currently not being tested. But yes, I agree that the test suite shouldn't be relied too much on compared to code inspection and review.

Re: Trying to push into empty repo, get fatal: bad revision 'HEAD'

2015-04-01 Thread Johannes Schindelin
Hi Junio, On 2015-04-01 20:00, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Yeah, and we could refactor that into a global function, too. But for the moment, I think your proposed patch is good enough. OK, so can I forge your Acked-by? You read my mind

Re: [PATCH] reduce progress updates in background

2015-04-14 Thread Johannes Schindelin
Hi Brian, On 2015-04-14 05:12, brian m. carlson wrote: On Mon, Apr 13, 2015 at 11:48:50PM +1000, Luke Mewburn wrote: I appreciated the opportunity to learn about tcgetpgrp(3). The Windows folks will probably need to stub that function out, but they're no worse off than they were before.

Re: [BUG] git pull will regress between 'master' and 'pu'

2015-04-21 Thread Johannes Schindelin
Hi Junio, On 2015-04-20 21:28, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: This is primarily note-to-self; even though I haven't got around bisecting yet, I think I know I did some bad change myself. git pull $URL $tag seems to: * fail to invoke the editor without

Re: [msysGit] [PATCH] compat/mingw: stubs for getpgid() and tcgetpgrp()

2015-04-24 Thread Johannes Schindelin
Hi Rupert, On 2015-04-23 21:25, rupert thurner wrote: On Thursday, April 16, 2015 at 2:45:11 PM UTC+2, Johannes Schindelin wrote: However, using this code for `getppid()` would be serious overkill (not to mention an unbearable performance hit because you have to enumerate *all* processes

Re: [PATCH 2/2] connect: improve check for plink to reduce false positives

2015-04-24 Thread Johannes Schindelin
Hi Peff, On 2015-04-23 17:53, Jeff King wrote: What about plink-0.83 that was mentioned earlier in the thread? I was working a lot with Java projects where the base name is often considered to be the part before a version number that is encoded into the file name, so I think it would be a

Re: [PATCH 2/2] connect: improve check for plink to reduce false positives

2015-04-24 Thread Johannes Schindelin
Hi Brian, On 2015-04-24 01:14, brian m. carlson wrote: On Thu, Apr 23, 2015 at 11:53:04AM -0400, Jeff King wrote: If I were writing from scratch, I would probably keep things as tight as possible, like: const char *base = basename(ssh); plink = !strcasecmp(base, plink) ||

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Johannes Schindelin
Hi Patrick, On 2015-04-22 16:36, Patrick Sharp wrote: The plink string detection in GIT_SSH for setting putty to true is very broad. Wow. You probably wanted to state that you are using Windows, downloaded Git from [link here], that you are using [version] and that you use PLink [version]

Re: [PATCH 7/9] strbuf_getwholeline: use getdelim if it is available

2015-04-22 Thread Johannes Schindelin
Hi, On 2015-04-17 12:16, Eric Sunshine wrote: On Thu, Apr 16, 2015 at 5:01 AM, Jeff King p...@peff.net wrote: We spend a lot of time in strbuf_getwholeline in a tight loop reading characters from a stdio handle into a buffer. The libc getdelim() function can do this for us with less

Re: [PATCH v2] t0027: Add repoMIX and LF_nul

2015-04-25 Thread Johannes Schindelin
, depending on the configuration Works precisely as advertised on Windows (tested on top of Git for Windows 2.3.6 release 2). Signed-off-by: Torsten Bögershausen tbo...@web.de FWIW Acked-by: Johannes Schindelin johannes.schinde...@gmx.de Ciao, Dscho -- To unsubscribe from this list: send

Re: [PATCH 2/2] connect: improve check for plink to reduce false positives

2015-04-23 Thread Johannes Schindelin
Hi Brian, On 2015-04-23 02:06, brian m. carlson wrote: + tortoiseplink = tplink == ssh || + (tplink is_dir_sep(tplink[-1])); Maybe have a helper function here? Something like `basename_matches(const char *path, const char

Re: Proposal for git stash : add --staged option

2015-04-22 Thread Johannes Schindelin
Hi Edgar, On 2015-04-22 10:30, edgar.h...@netapsys.fr wrote: When you have a lot of unstaged files, and would like to test what happens if you undo some of the changes that you think are unecessary, you would rather keep a copy of those changes somewhere. For example Changed but not

Re: [PATCH] rebase -i: redo tasks that die during cherry-pick

2015-04-28 Thread Johannes Schindelin
Hi, On 2015-04-29 00:55, Phil Hord wrote: When rebase--interactive processes a task, it removes the item from the todo list and appends it to another list of executed tasks. If a pick (this includes squash and fixup) fails before the index has recorded the changes, take the corresponding item

Re: Windows path limits, was Re: [PATCH v5 2/5] setup: sanity check file size in read_gitfile_gently

2015-04-28 Thread Johannes Schindelin
Hi, On 2015-04-28 17:33, Doug Kelly wrote: If you're able to do everything through the Unicode Win32 APIs, you can reach 65535 characters, assuming the filesystem supports it (NTFS does, FAT32 would not, for example). I recall there being one function (possibly thinking of mktemp) that

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-04-27 Thread Johannes Schindelin
the downside that a program such as plink-0.63 would no longer be recognized, but the increased robustness is likely worth it. Add tests to cover these cases to avoid regressions. Signed-off-by: brian m. carlson sand...@crustytoothpaste.net I like it! Acked-by: Johannes Schindelin johannes.schinde

Windows path limites, was Re: [PATCH v5 2/5] setup: sanity check file size in read_gitfile_gently

2015-04-28 Thread Johannes Schindelin
Hi Peff, On 2015-04-28 08:02, Jeff King wrote: My understanding is that PATH_MAX is set absurdly low on Windows systems (and doesn't actually represent the real limit of a path!). Well, yes and no. Yes, it is absurdly low on Windows, and yes, it is not the real limit of a path *if you know

Re: [PATCH v2] bundle: verify arguments more strictly

2015-05-08 Thread Johannes Schindelin
Hi Patrick, On 2015-05-08 10:02, Patrick Steinhardt wrote: Added missing Signed-off-by. Hah, mid-air collision ;-) Still: ACK! Ciao, Johannes -- 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

Re: [PATCH 2/2] pull: use git-rev-parse --parseopt for option parsing

2015-05-18 Thread Johannes Schindelin
Hi Paul, On 2015-05-18 15:54, Paul Tan wrote: diff --git a/git-pull.sh b/git-pull.sh index 633c385..67f825c 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,13 +4,53 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -USAGE='[-n | --no-stat]

Re: automatic git installation

2015-05-12 Thread Johannes Schindelin
Hi Fabian, On 2015-05-12 10:50, Knobbe, Fabian wrote: I would like to automatically install git with a script. ... on Windows. I already found some command line arguments to pass my settings to the setup routine, but I still don't know how to set Adjust your PATH environment to Use Git

Re: determine a linux kernel version of a patch file

2015-05-15 Thread Johannes Schindelin
Hi, On 2015-05-15 19:03, Kelvin Li wrote: On Fri, 2015-05-15 at 14:08 +0200, Matthieu Moy wrote: Pawel Por porpa...@gmail.com writes: At the beginning I'm sorry if this post is completely unrelated to this mailing list. I'm trying to find the base linux kernel version from which a patch

Re: support git+mosh for unreliable connections

2015-04-15 Thread Johannes Schindelin
Hi Praveen, On 2015-04-15 16:18, Pirate Praveen wrote: On Wednesday 15 April 2015 07:22 PM, Michael J Gruber wrote: What would that require git to do, beyond taking whatever you tell it (using GIT_SSH or _GIT_SSH_COMMAND) to use as a drop in replacement for ssh? May be support git+mosh as a

Re: support git+mosh for unreliable connections

2015-04-15 Thread Johannes Schindelin
Hi Praveen A, On 2015-04-15 15:07, Pirate Praveen wrote: When working with big projects over a slow, unreliable connection, currently there is no way to resume a clone or pull when the connection breaks. mosh is a better replacement for ssh over unreliable connections. supporting

Re: support git+mosh for unreliable connections

2015-04-15 Thread Johannes Schindelin
Hi Trevor, On 2015-04-15 17:33, Trevor Saunders wrote: On Wed, Apr 15, 2015 at 04:41:42PM +0200, Johannes Schindelin wrote: On 2015-04-15 16:18, Pirate Praveen wrote: On Wednesday 15 April 2015 07:22 PM, Michael J Gruber wrote: What would that require git to do, beyond taking whatever you

Re: [PATCH 3/3] t0027: Add repoMIX and LF_nul

2015-04-15 Thread Johannes Schindelin
Hi Torsten, On 2015-04-15 19:01, Torsten Bögershausen wrote: t/t0027-auto-crlf.sh | 155 --- I fear that we duplicated work here, due to me working on Git for Windows 2.x and you sending mails to the non-Windows mailing list. For what it is

Re: [PATCH] compat/mingw: stubs for getpgid() and tcgetpgrp()

2015-04-16 Thread Johannes Schindelin
Hi Junio, On 2015-04-15 20:48, Junio C Hamano wrote: Johannes Sixt j...@kdbg.org writes: Windows does not have process groups. It is, therefore, the simplest to pretend that each process is in its own process group. While here, move the getppid() stub from its old location (between two

Re: Issue: repack semi-frequently fails on Windows (msysgit) - suspecting file descriptor issues

2015-04-16 Thread Johannes Schindelin
Hi, On 2015-04-16 13:10, Thomas Braun wrote: Am 16.04.2015 um 12:03 schrieb Andreas Mohr: over the years I've had the same phenomenon with various versions of msysgit (now at 1.9.5.msysgit.0, on Windows 7 64bit), so I'm now sufficiently confident of it being a long-standing, longer-term

Re: [msysGit] [PATCH] compat/mingw: stubs for getpgid() and tcgetpgrp()

2015-04-16 Thread Johannes Schindelin
Hi kusma, On 2015-04-15 21:43, Erik Faye-Lund wrote: On Wed, Apr 15, 2015 at 8:29 PM, Johannes Sixt j...@kdbg.org wrote: Windows does not have process groups. It is, therefore, the simplest to pretend that each process is in its own process group. Windows does have some concept of process

Re: Issue: repack semi-frequently fails on Windows (msysgit) - suspecting file descriptor issues

2015-04-16 Thread Johannes Schindelin
Hi Andreas, On 2015-04-16 14:35, Andreas Mohr wrote: On Thu, Apr 16, 2015 at 01:48:46PM +0200, Andreas Mohr wrote: OK, at this point in time it's my turn to actually verify that indeed it's NOT the virus scanner: - generate rebase-heavy activity - update - hit issue - unload virus (~

Re: [PATCH 3/3] t0027: Add repoMIX and LF_nul

2015-04-16 Thread Johannes Schindelin
Hi Torsten, On 2015-04-15 21:58, Torsten Bögershausen wrote: Yes, I try to be up-to-date with Git for Windows, but missed to follow this very patch. Do you plan to send it to git.git ? I did plan to send it to this mailing list (together with the other 23 branches we accumulated in all

Re: [PATCH] dir: allow a BOM at the beginning of exclude files

2015-04-16 Thread Johannes Schindelin
Hi Carlos, On 2015-04-16 16:05, Carlos Martín Nieto wrote: Some text editors like Notepad or LibreOffice write an UTF-8 BOM in order to indicate that the file is Unicode text rather than whatever the current locale would indicate. If someone uses such an editor to edit a gitignore file, we

Re: Issue: repack semi-frequently fails on Windows (msysgit) - suspecting file descriptor issues

2015-04-16 Thread Johannes Schindelin
Hi Peff, On 2015-04-16 17:28, Jeff King wrote: On Thu, Apr 16, 2015 at 01:35:05PM +0200, Andreas Mohr wrote: I strongly suspect that git's repacking implementation (probably unrelated to msysgit-specific deviations, IOW, git *core* handling) simply is buggy in that it may keep certain

Re: [bug] first line truncated with `git log --oneline --decorate --graph`

2015-04-16 Thread Johannes Schindelin
Hi, On 2015-04-16 17:28, Junio C Hamano wrote: Robin Moussu robin.mou...@gmail.com writes: I have a bug using the following command: git log --oneline --decorate --graph In short, the first line of the log is often truncated. I imagine that the pager (`less`) cuts off the lines

git-owner, was Re: [bug] first line truncated with `git log --oneline --decorate --graph`

2015-04-16 Thread Johannes Schindelin
Hi David, On 2015-04-16 17:56, David Miller wrote: Hey folks, please remove git-owner from the CC: list, that goes to me and not the list :-) I feared as much, but I cannot recall putting you on any Cc: myself. It appeared to me as if the list added git-owner@vger as sender, at least under

Re: [PATCH] dir: allow a BOM at the beginning of exclude files

2015-04-16 Thread Johannes Schindelin
Hi, On 2015-04-16 17:39, Junio C Hamano wrote: Also do we need a similar change to the attribute side, or are we already covered and we forgot to do the same for the ignore files? I fear so: https://github.com/git/git/blob/v2.3.5/attr.c#L359-L376 As for the config, we are safe:

Re: git-owner, was Re: [bug] first line truncated with `git log --oneline --decorate --graph`

2015-04-16 Thread Johannes Schindelin
On 2015-04-16 18:31, David Miller wrote: From: Jeff King p...@peff.net Date: Thu, 16 Apr 2015 12:26:21 -0400 Weird. In a nearby thread with the same problem, the first email that mentions git-owner in a cc header is yours[1]. It's in reply to a message that does not mention git-owner at

Re: git-owner, was Re: [bug] first line truncated with `git log --oneline --decorate --graph`

2015-04-17 Thread Johannes Schindelin
Hi Dave, On 2015-04-16 19:06, Johannes Schindelin wrote: On 2015-04-16 18:31, David Miller wrote: From: Jeff King p...@peff.net Date: Thu, 16 Apr 2015 12:26:21 -0400 Weird. In a nearby thread with the same problem, the first email that mentions git-owner in a cc header is yours[1]. It's

Re: Draft of Git Rev News edition 2

2015-04-13 Thread Johannes Schindelin
Hi Thomas, On 2015-04-12 22:51, Thomas Ferris Nicolaisen wrote: On Sun, Apr 12, 2015 at 9:03 PM, Christian Couder christian.cou...@gmail.com wrote: A draft of Git Rev News edition 2 is available here: https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-2.md There's

Re: [PATCH 1/7] path.c: implement xdg_config_home()

2015-04-13 Thread Johannes Schindelin
Hi Paul, maybe it would be a good idea to add a `0/7` mail that describes the overall goal of this patch series, much like a Pull Request? I found it very useful -- even for myself -- to set a description via `git branch --edit-description` and to let `git format-patch` use that via the

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

2015-04-12 Thread Johannes Schindelin
Hi Rupert, On 2015-04-11 10:37, rupert thurner wrote: three things i do not like it so much: * the old distinct icon is replaced by a new one which looks similar to many other programs, like google chrome. would it be possible to set the old icon? Git 1.9.5 came with the Git icon already

Re: [PATCH v2 2/2] t0027: Support NATIVE_CRLF

2015-04-17 Thread Johannes Schindelin
test_cmp to show which warning is missing (or should'n t be there) Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Torsten Bögershausen tbo...@web.de Thank you so much! Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH v2 2/2] t0027: Support NATIVE_CRLF

2015-04-17 Thread Johannes Schindelin
the information given by check_warning(): Use test_cmp to show which warning is missing (or should'n t be there) Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de Signed-off-by: Torsten Bögershausen tbo...@web.de Originally I wanted to have Dscho as Author, is that OK with you

Re: REQUEST-PULL: Please pull from git-gui.

2015-04-18 Thread Johannes Schindelin
Hi Pat, On 2015-04-18 15:47, Pat Thoyts wrote: Sebastian Schuberth (1): git-gui/gitk: Do not depend on Cygwin's kill command on Windows Awesome! Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v2 2/2] t0027: Support NATIVE_CRLF

2015-04-18 Thread Johannes Schindelin
Hi Junio, On 2015-04-17 23:04, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-04-17 17:44, Torsten Bögershausen wrote: Without this patch, t0027 expects the native end-of-lines to be a single line feed character. On Windows, however, we set

Re: What's cooking in git.git (Apr 2015, #02; Tue, 14)

2015-04-15 Thread Johannes Schindelin
Hi Junio, On 2015-04-14 23:49, Junio C Hamano wrote: * jc/update-instead-into-void (2015-04-01) 1 commit (merged to 'next' on 2015-04-08 at 8ef4e15) + push-to-deploy: allow pushing into an unborn branch and updating it A push into an unborn branch, with receive.denyCurrentBranch set

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

2015-04-15 Thread Johannes Schindelin
Hi Vitaly, On 2015-04-15 09:17, Vitaly wrote: feel free to give it a spin: https://git-for-windows.github.io/#download I have installed msysgit 1.9.4, installing git for windows 2.3.5.8 (into default localtion and with use from Windows command prompt) Which version, 32-bit or 64-bit?

Re: Hanging git mv on Windows bug report

2015-05-19 Thread Johannes Schindelin
Hi Yuval, On 2015-05-18 08:50, Yuval Greenfield wrote: Here is the command sequence that causes git to stop responding: mkdir mynewthing cd mynewthing git init mkdir abc touch abc/myfile git add abc/myfile git commit -a -m whatever git mv abc tmp git mv tmp Abc I wanted to change

Re: sh -x -i -v with continuous integration, was Re: [PATCH 1/4] t7601: test for pull.ff=true overrides merge.ff=false

2015-05-19 Thread Johannes Schindelin
Hi Paul, On 2015-05-16 14:33, Paul Tan wrote: On Fri, May 15, 2015 at 12:53 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Asketh and ye shall be given: without running the tests in parallel, our Jenkins would take *even longer* than the three hours per test suite run (which

Re: [PUB]corrupt repos does not return error with `git fsck`

2015-05-20 Thread Johannes Schindelin
Hi, On 2015-05-20 19:19, Matthieu Moy wrote: Faheem Mitha fah...@faheem.info writes: Clone the repos https://github.com/fmitha/SICL. Then git show 280c12ab49223c64c6f914944287a7d049cf4dd0 gives fatal: bad object 280c12ab49223c64c6f914944287a7d049cf4dd0 It seems

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