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

2015-06-18 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 v5 16/19] fsck: Support demoting errors to warnings

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

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

2015-06-18 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

Re: [PATCH v3 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

2015-06-18 Thread Johannes Schindelin
On 2015-06-18 21:45, Junio C Hamano wrote: This round looks good, except one trivial nit (below), which I'll locally squash-in a fix for. Thanks, Dscho -- 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

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

2015-06-18 Thread Johannes Schindelin
message types (i.e. error or warning?). 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

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

2015-06-18 Thread Johannes Schindelin
values. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- fsck.c | 30 -- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/fsck.c b/fsck.c index ed0bfc3..4595c7f 100644 --- a/fsck.c +++ b/fsck.c @@ -63,15 +63,41 @@ enum fsck_msg_id

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

2015-06-18 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

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

2015-06-22 Thread Johannes Schindelin
Hi Junio, On 2015-06-22 19:37, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: diff --git a/fsck.c b/fsck.c index 1a3f7ce..e81a342 100644 --- a/fsck.c +++ b/fsck.c @@ -64,30 +64,29 @@ enum fsck_msg_id { #undef MSG_ID #define STR(x) #x -#define MSG_ID(id

Re: incomplete footers added by list server?

2015-06-23 Thread Johannes Schindelin
Hi Dennis, On 2015-06-23 11:43, Dennis Kaarsemaker wrote: Since last friday between 10:39 and 10:50 UTC, mails to git@vger suddenly get an incomplete footer added. Instead of the normal footer: To unsubscribe from this list: send the line unsubscribe git in the body of a message to

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

2015-06-22 Thread Johannes Schindelin
Hi Junio, On 2015-06-21 22:35, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-06-21 19:15, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: That's brilliant. Just to make sure I am reading you correctly, you mean the current

Re: [msysGit] Re: Release candidate of Git for Windows 2.x is out

2015-06-27 Thread Johannes Schindelin
On 2015-06-26 13:06, Ties wrote: Do you have an ETA on the final release? No, sorry, no ETA yet. -- 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: git error in tag ...: unterminated header

2015-06-27 Thread Johannes Schindelin
Hi Junio, On 2015-06-26 19:37, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Fri, Jun 26, 2015 at 10:06:20AM +0200, Johannes Schindelin wrote: I understood what you were saying, but it still appears too fragile to me to mix functions that assume NUL-terminated strings with an ad

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

2015-06-26 Thread Johannes Schindelin
Hi Peff, On 2015-06-26 18:27, Jeff King wrote: On Fri, Jun 26, 2015 at 09:16:20AM -0700, Junio C Hamano wrote: FYI, this ended up biting me today. We have some integration tests that make sure we can clone over putty, and we wrap plink in a plink-wrapper.sh script that tweaks a few extra

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

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

2015-06-18 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 --- a/t/t5504-fetch-receive

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

2015-06-18 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 v5 08/19] fsck: Make fsck_commit() warn-friendly

2015-06-18 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 missingauthor error to a warning would hide a problematic committer line. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de

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

2015-06-18 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 -- t/t5504-fetch

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

2015-06-18 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 v5 13/19] fsck: Optionally ignore specific fsck issues completely

2015-06-18 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

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

2015-06-18 Thread Johannes Schindelin
Hi Junio, On 2015-06-19 00:11, Junio C Hamano wrote: I haven't had a chance to go through the all the patches, but one thing I noticed that did not appear in the interdiff is that some of the message IDs are unclear. For example, there are BAD_something, INVALID_something and

Re: [PATCH/WIP v3 01/31] wrapper: implement xopen()

2015-06-24 Thread Johannes Schindelin
Hi Stefan, On 2015-06-24 18:59, Stefan Beller wrote: On Wed, Jun 24, 2015 at 9:28 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-06-18 13:25, Paul Tan wrote: + int fd = open(path, oflag, mode); + if (fd = 0) + return fd

Re: [PATCH] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-11 Thread Johannes Schindelin
Hi Mike, On 2015-06-11 16:02, Mike Rappazzo wrote: On Thu, Jun 11, 2015 at 9:40 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-06-11 03:30, Michael Rappazzo wrote: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..6d14315 100644

Re: [PATCH] git-rebase--interactive.sh: add config option for custom instruction format

2015-06-11 Thread Johannes Schindelin
Hi Michael, On 2015-06-11 03:30, Michael Rappazzo wrote: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..6d14315 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -740,10 +740,19 @@ collapse_todo_ids() { # pick sha1

Re: rebase -i might leave CHERRY_PICK_HEAD behind

2015-06-16 Thread Johannes Schindelin
Hi, On 2015-06-16 14:06, SZEDER Gábor wrote: When skipping an empty commit with 'git rebase --continue' a CHERRY_PICK_HEAD file might be left behind. Yeah, I noticed that, too... it even survives the cleanup of the finished rebase under certain circumstances. Maybe something like this? --

[PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

2015-06-17 Thread Johannes Schindelin
the latter would also skip legitimate patches if there were merge conflicts, while the former would not allow that. Johannes Schindelin (2): t3404: demonstrate CHERRY_PICK_HEAD bug rebase -i: do not leave a CHERRY_PICK_HEAD file behind git-rebase--interactive.sh| 6 +- t/t3404

[PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug

2015-06-17 Thread Johannes Schindelin
in such a situation. However, as pointed out by Gábor Szeder, this leaves a CHERRY_PICK_HEAD behind, making the Git prompt believe that a cherry pick is still going on. This commit adds a test case demonstrating this bug. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- t/t3404

[PATCH 2/2] rebase -i: do not leave a CHERRY_PICK_HEAD file behind

2015-06-17 Thread Johannes Schindelin
--interactive.sh is called. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- git-rebase--interactive.sh| 6 +- t/t3404-rebase-interactive.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f

Re: [PATCH/RFC] Revert git am/mailinfo: Don't look at in-body headers when rebasing

2015-06-16 Thread Johannes Schindelin
Hi Paul, On 2015-06-16 11:03, Paul Tan wrote: This reverts commit d25e51596be9271ad833805a3d6f9012dc24ee79, removing git-mailsplit's --no-inbody-headers option. While --no-inbody-headers was introduced to prevent commit messages from being munged by git-mailinfo while rebasing, the need for

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

2015-06-16 Thread Johannes Schindelin
Hi Eric, On 2015-06-16 03:17, Eric Raible wrote: I'm running 1.9.5.msysgit.1, but this is a general git question... Upon returning from a vacation, I was looking at what people had been up to, and discovered on merge in which a colleague had resolved a merge incorrectly. It turns out that

Re: [PATCH] git-new-workdir: add windows compatibility

2015-05-27 Thread Johannes Schindelin
Hi Daniel, On 2015-05-26 19:16, Daniel Smith wrote: Thanks to everyone for reviewing my proposed patch an providing valuable feedback. This was my first patch submission to a large open source project like Git and the whole process was a little daunting. Heh, yeah, it can be quite

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word drop to remove a commit

2015-05-28 Thread Johannes Schindelin
Hi Stefan, On 2015-05-27 23:47, Stefan Beller wrote: On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote: Talking about ideas: I sometimes have the wrong branch checked out when doing a small fixup commit. So I want to drop that patch from the current branch and apply it

Re: [PATCH] git-new-workdir: add windows compatibility

2015-05-29 Thread Johannes Schindelin
Hi Michael, On 2015-05-29 11:53, Michael J Gruber wrote: Johannes Schindelin venit, vidit, dixit 26.05.2015 14:35: For what it is worth, I tried my hand a couple of years ago at the project to move git-new-workdir to use the `.git` *file* and alternates mechanisms, but that does not work

Re: [PATCH/RFC 1/2] git-rebase -i: Add key word drop to remove a commit

2015-05-27 Thread Johannes Schindelin
Hi Rémi, On 2015-05-26 23:38, Galan Rémi wrote: Instead of removing a line to remove the commit, you can use the key word drop (just like pick or edit). It has the same effect as deleting the line (removing the commit) except that you keep a visual trace of your actions, allowing a better

Release candidate of Git for Windows 2.x is out

2015-05-27 Thread Johannes Schindelin
Hi all, I just uploaded release candidates for the upcoming Git for Windows 2.x release. Please find the download link here: https://git-for-windows.github.io/#download There are 32-bit and 64-bit versions both of regular installers and portable installers (portable meaning that they are .7z

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi Stefan, On 2015-06-29 11:07, Stefan Näwe wrote: Am 29.06.2015 um 10:30 schrieb Johannes Schindelin: I just uploaded the 4th release candidate for the upcoming Git for Windows 2.x release. Please find the download link here: https://git-for-windows.github.io/#download The most important

Re: [PATCH] fsck: it is OK for a tag and a commit to lack the body

2015-06-29 Thread Johannes Schindelin
Hi Junio, On 2015-06-29 07:42, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: Hmm. Maybe we should still warn when there is no empty line finishing the header explicitly, or at least make it FSCK_IGNORE by default so that maintainers who like a stricter check

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi Konstantin, On 2015-06-29 17:54, Konstantin Khomoutov wrote: I've finally took time to switch from my old msys1 release to this RC4, and immediately got hit by the fact Git is now speaking to me in Russian, which is not what I want (previously this behaviour was only exhibited by `git

Re: [PATCH] git-filter-branch.sh: clarify an error message

2015-07-05 Thread Johannes Schindelin
Hi, On 2015-07-05 15:07, Jeff King wrote: On Sat, Jul 04, 2015 at 07:39:04PM -0400, Chris Jones wrote: Make git filter-branch output a useful error message when a single commit is given instead of a range. Currently, when given a command like git filter-branch --msg-filter 'echo TEST' --

Re: [PATCH 02/12] t4150: am fails if index is dirty

2015-07-05 Thread Johannes Schindelin
Hi Paul, On 2015-07-02 20:16, Paul Tan wrote: diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 3f54bdf..0a19136 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -154,6 +154,17 @@ test_expect_success 'am applies patch correctly' ' test $(git rev-parse second^) = $(git rev-parse

Re: [PATCH 00/12] Improve git-am test coverage

2015-07-05 Thread Johannes Schindelin
Hi, On 2015-07-03 18:24, Stefan Beller wrote: On Thu, Jul 2, 2015 at 11:16 AM, Paul Tan pyoka...@gmail.com wrote: Increase test coverage of git-am.sh to help prevent regressions that could arise from the rewrite of git-am.sh to C. This patch series, along with pt/am-foreign, improved test

Re: [PATCH 09/12] t4150: am with post-applypatch hook

2015-07-05 Thread Johannes Schindelin
Hi Paul, On 2015-07-02 20:16, Paul Tan wrote: diff --git a/t/t4150-am.sh b/t/t4150-am.sh index dd6fe81..62b678c 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -275,6 +275,48 @@ test_expect_success 'am with failing pre-applypatch hook' ' test_cmp_rev first HEAD '

Re: [PATCH] --count feature for git shortlog

2015-06-30 Thread Johannes Schindelin
Hi Lawrence, On 2015-06-29 18:46, Lawrence Siebert wrote: I appreciate your help. Okay, That all makes sense. I would note that something like: git shortlog -s $FILENAME: | cut -f 1 | paste -sd+ - | bc seems like it run much faster then: git log --oneline $FILENAME | wc -l How

Re: [PATCH 3/3] clone: add `--seed` shorthand

2015-05-22 Thread Johannes Schindelin
Hi Philip, On 2015-05-21 21:45, Philip Oakley wrote: From: Johannes Schindelin johannes.schinde...@gmx.de On 2015-05-21 06:16, Jeff King wrote: diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f1f2a3f..ffeb03b 100644 --- a/Documentation/git-clone.txt +++ b

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Johannes Schindelin
Hi, On 2015-05-22 19:14, Philip Oakley wrote: From: Johannes Schindelin johannes.schinde...@gmx.de On 2015-05-22 11:42, Johannes Schindelin wrote: On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller sbel...@google.com wrote: On Tue, May 19, 2015 at 12:29 PM

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Johannes Schindelin
Hi Stefan, On 2015-05-22 21:23, Stefan Beller wrote: Ok, I am trying it out now, all I have left is Register your email address (stefanbel...@googlemail.com) with submitGit's Amazon SES account in order for it to send emails from you. So first of all: Where do I

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-23 Thread Johannes Schindelin
Hi Roberto, On 2015-05-22 23:28, Roberto Tyley wrote: I'm currently on a cycling holiday on an island off the west coast of Scotland, **without a laptop**, so updates to submitGit (based on the excellent feedback I've been receiving) will probably start mid-next week. Ah, I am jealous. Enjoy

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-23 Thread Johannes Schindelin
Hi Philip, On 2015-05-22 23:35, Philip Oakley wrote: Do I read you right.. That it's necessary to create a PR on git/git before submitGit can be used. Yep. And that if I already have a PR which goes back to an alternate fork (e.g. my example), then I must move or duplicate that PR onto

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-23 Thread Johannes Schindelin
Hi Junio, On 2015-05-22 22:04, Junio C Hamano wrote: On Fri, May 22, 2015 at 12:59 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-05-22 21:23, Stefan Beller wrote: So first of all: Where do I find the Amazon SES account for submitGit, to register my email with? Also

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

2015-05-21 Thread Johannes Schindelin
Hi Junio, On 2015-05-20 23:00, Junio C Hamano wrote: Sebastian Schuberth sschube...@gmail.com writes: On Wed, May 20, 2015 at 10:13 PM, Junio C Hamano gits...@pobox.com wrote: David Aguilar dav...@gmail.com writes: + for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)='

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Johannes Schindelin
Hi Roberto, On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller sbel...@google.com wrote: On Tue, May 19, 2015 at 12:29 PM, Robert Dailey rcdailey.li...@gmail.com wrote: How do you send your patches inline? [snip] This workflow discussion was a topic at the

Re: [Announce] submitGit for patch submission (was Diffing submodule does not yield complete logs)

2015-05-22 Thread Johannes Schindelin
Hi Roberto, On 2015-05-22 11:42, Johannes Schindelin wrote: On 2015-05-22 10:33, Roberto Tyley wrote: On Tuesday, 19 May 2015, Stefan Beller sbel...@google.com wrote: On Tue, May 19, 2015 at 12:29 PM, Robert Dailey rcdailey.li...@gmail.com wrote: How do you send your patches inline? [snip

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Johannes Schindelin
Hi Paul, On 2015-05-22 15:48, Paul Tan wrote: On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano gits...@pobox.com wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: - fprintf(stderr, - _(There are no candidates for merging among the refs

Re: [PATCH 02/14] pull: pass verbosity, --progress flags to fetch and merge

2015-05-21 Thread Johannes Schindelin
Hi Paul, On 2015-05-21 11:48, Paul Tan wrote: On Tue, May 19, 2015 at 1:41 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-05-18 17:05, Paul Tan wrote: diff --git a/builtin/pull.c b/builtin/pull.c index 0b771b9..a4d9c92 100644 --- a/builtin/pull.c +++ b/builtin/pull.c

Re: [PATCH 3/3] clone: add `--seed` shorthand

2015-05-21 Thread Johannes Schindelin
Hi Peff, On 2015-05-21 06:16, Jeff King wrote: diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f1f2a3f..ffeb03b 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -107,6 +107,9 @@ objects from the source repository into a pack in the

Re: [PATCH] git-new-workdir: add windows compatibility

2015-05-26 Thread Johannes Schindelin
Hi, On 2015-05-26 06:03, Junio C Hamano wrote: Daniel Smith dansmit...@gmail.com writes: When running on Windows in MinGW, creating symbolic links via ln always failed. Using mklink instead of ln is the recommended method of creating links on Windows:

Re: [PATCH] git-new-workdir: add windows compatibility

2015-05-26 Thread Johannes Schindelin
Hi Paul, On 2015-05-26 14:20, Paul Smith wrote: On Tue, 2015-05-26 at 11:53 +0200, Johannes Schindelin wrote: The biggest problem with `mklink` is that it is only supported on Windows Vista and later, while I really like to keep Windows XP support in Git for Windows. No, the biggest

Re: [PATCH 09/12] t4150: am with post-applypatch hook

2015-07-07 Thread Johannes Schindelin
Hi Paul, On 2015-07-07 08:47, Paul Tan wrote: On Sun, Jul 5, 2015 at 11:58 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-07-02 20:16, Paul Tan wrote: diff --git a/t/t4150-am.sh b/t/t4150-am.sh index dd6fe81..62b678c 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh

Re: undocumented core.sharedRepository=2 set by git init --shared=world

2015-07-07 Thread Johannes Schindelin
Hi Joey, On 2015-07-06 21:25, Joey Hess wrote: joey@darkstar:~/tmpgit init --shared=world testrepo Initialized empty shared Git repository in /home/joey/tmp/testrepo/.git/ joey@darkstar:~/tmpgrep shared testrepo/.git/config sharedrepository = 2 This magic value of 2 seems to be

Re: [PATCH v2 00/12] Improve git-am test coverage

2015-07-07 Thread Johannes Schindelin
Hi Paul On 2015-07-07 16:08, Paul Tan wrote: This is a re-roll of [v1]. Thanks Junio, Johannes, Paolo, Stefan for the reviews last round. Interdiff below. Interdiff looks good to me! Thanks, Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

2015-08-13 Thread Johannes Schindelin
Hi kusma, On 2015-08-12 13:58, Erik Faye-Lund wrote: On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-08-11 22:51, Johannes Sixt wrote: Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink

Re: [msysGit] [PATCH jk/prune-mtime] prune: close directory earlier during loose-object directory traversal

2015-08-13 Thread Johannes Schindelin
Hi, On 2015-08-12 19:43, Johannes Sixt wrote: 27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16) introduced a new function for_each_loose_file_in_objdir() with a helper for_each_file_in_obj_subdir(). The latter calls callbacks for each file found during a directory

Re: [PATCH nd/dwim-wildcards-as-pathspecs] t2019: skip test requiring '*' in a file name non Windows

2015-08-13 Thread Johannes Schindelin
Hi Junio, On 2015-08-12 18:28, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-08-11 22:38, Johannes Sixt wrote: diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 8396320..199b22d 100755 --- a/t/t2019-checkout

Re: [msysGit] Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

2015-08-13 Thread Johannes Schindelin
Hi Johannes, On 2015-08-12 20:31, Johannes Sixt wrote: Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund: On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: FWIW Git for Windows has this patch (that I wanted to contribute in due time, what with being busy

Re: [PATCH] am --abort: merge ORIG_HEAD tree into index

2015-08-17 Thread Johannes Schindelin
Hi Paul, On 2015-08-17 11:48, Paul Tan wrote: It's true that we need to merge the ORIG_HEAD tree into the index instead of overwriting it. Patch below. Thanks for your impressive, very responsive work! Dscho -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: No dialog box appears

2015-08-19 Thread Johannes Schindelin
Hi Aleksey, On 2015-08-19 09:33, Цапков Алексей wrote: When installing the Git is not a dialog box appears with a choice ssh. What could be the reason? I assume that you are referring to the Git for Windows installer (please state such details in the future). And I assume you were wondering

Re: [PATCH] Fix `git rev-list --show-notes HEAD` when there are no notes

2015-08-24 Thread Johannes Schindelin
Hi Peff, On 2015-08-24 16:43, Jeff King wrote: On Mon, Aug 24, 2015 at 12:23:52PM +0200, Johannes Schindelin wrote: You're right. I think the best approach for now is to error out when `--show-notes` is passed to rev-list. Do you agree? Yes (I imagine you didn't yet read my follow-up

Git for Windows 2.5.0

2015-08-18 Thread Johannes Schindelin
Dear Git (for Windows) users, it is my great pleasure to announce the first official version of Git for Windows. We finally have caught up with Git 2.x and are ready to leave the -preview suffix behind (more on that below). It is available at https://git-for-windows.github.io/ and also at

Re: [PATCH] config.mak.uname: Cygwin: Use renames for creation

2015-08-18 Thread Johannes Schindelin
Hi Adam, On 2015-08-09 19:05, Adam Dinwoodie wrote: On 09/08/2015 10:01, Johannes Schindelin wrote: On 2015-08-09 04:01, Adam Dinwoodie wrote: We've gotten a lot of users on the list who ask why their Git directories on shared drives aren't working (or are broken in some way). Since I

Re: git am --abort screwing up index?

2015-08-17 Thread Johannes Schindelin
Schindelin johannes.schinde...@gmx.de Date: Mon, 17 Aug 2015 09:37:39 +0200 Subject: [PATCH] t4151: demonstrate that builtin am corrupts index' stat data Reported by Linus Torvalds. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- t/t4151-am-abort.sh | 12 1 file changed, 12

Re: [PATCH] Fix `git rev-list --show-notes HEAD` when there are no notes

2015-08-24 Thread Johannes Schindelin
Hi Peff, On 2015-08-23 19:43, Jeff King wrote: On Sat, Aug 22, 2015 at 05:14:39PM +0200, Johannes Schindelin wrote: The `format_display_notes()` function clearly assumes that the data structure holding the notes has been initialized already, i.e. that the `display_notes_trees` variable

[PATCH] Fix `git rev-list --show-notes HEAD` when there are no notes

2015-08-22 Thread Johannes Schindelin
. So let's be graceful and just return if that data structure is `NULL`. Reported in https://github.com/msysgit/git/issues/363. Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de --- notes.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/notes.c b/notes.c index

Re: [PATCH] fsck: it is OK for a tag and a commit to lack the body

2015-06-28 Thread Johannes Schindelin
Hi Junio, On 2015-06-28 20:18, Junio C Hamano wrote: diff --git a/fsck.c b/fsck.c index 88c92e8..3f264e7 100644 --- a/fsck.c +++ b/fsck.c @@ -255,6 +255,15 @@ static int require_end_of_header(const void *data, unsigned long size, } } + /* + * We did not

4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

2015-06-29 Thread Johannes Schindelin
Hi all, I just uploaded the 4th release candidate for the upcoming Git for Windows 2.x release. Please find the download link here: https://git-for-windows.github.io/#download The most important changes are the update to Git 2.4.5 and a fix for the crash when running Git Bash with a legacy

Re: [PATCH] config.c: fix writing config files on Windows network shares

2015-06-30 Thread Johannes Schindelin
Hi, On 2015-06-30 16:34, Karsten Blees wrote: Renaming to an existing file doesn't work on Windows network shares if the target file is open. munmap() the old config file before commit_lock_file. Signed-off-by: Karsten Blees bl...@dcon.de ACK. Thanks, Dscho -- To unsubscribe from this

Re: Windows 7 - long/short and upper/lower filename

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-03 23:18, JoséQuintas wrote: I am using Windows 7 64 bits. ... and Git version... ? I have a filename called ze_xmlfun.prg Last week gitgui shows 2 changed files: ZE_XML~1.PRG and ze_xmlfun.prg At momment I can't update this file, because get a error. Try delete file, update

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-07 19:10, Jarkko Hietaniemi wrote: But to be honest, I wasn't expecting a miracle cure. I guess the core of my gripe is just that: how the commit message is part of the SHA. The commit message is not part of the SHA but it is part of the content that defines the SHA-1. I

Re: Question

2015-08-11 Thread Johannes Schindelin
Hi, On 2015-08-11 10:28, Jet Rey Maza wrote: I'm wondering why gitbash dont have wget? Please take the time to write coherent questions in the future, giving enough context for others to understand what you are talking about. We are not dogs that you throw some bones, you know? We are highly

Re: What's cooking in git.git

2015-08-06 Thread Johannes Schindelin
Hi Junio, On 2015-08-06 00:55, Junio C Hamano wrote: * sb/submodule-helper (2015-08-05) 1 commit - submodule: implement `module_list` as a builtin helper The beginning of git submodule rewritten in C. I am really looking forward to that, with my Windows performance hat firmly on my

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-07 Thread Johannes Schindelin
Hi, On 2015-08-04 16:19, Paul Tan wrote: From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr Add the am.threeWay configuration variable to use the -3 or --3way option of git am by default. When am.threeway is set and not desired for a specific git am command, the --no-3way option can

Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

2015-08-07 Thread Johannes Schindelin
Hi Paul, On 2015-08-04 16:08, Paul Tan wrote: diff --git a/builtin/am.c b/builtin/am.c index 0961304..8c95aec 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2151,8 +2169,9 @@ int cmd_am(int argc, const char **argv, const [...] char *prefix) OPT_BOOL('3', 3way,

Re: [PATCH 2/2] pager_in_use: make sure output is still going to pager

2015-08-10 Thread Johannes Schindelin
Hi Peff, On 2015-08-10 07:23, Jeff King wrote: diff --git a/compat/pipe-id.c b/compat/pipe-id.c new file mode 100644 index 000..4764c5f --- /dev/null +++ b/compat/pipe-id.c @@ -0,0 +1,25 @@ +#include git-compat-util.h +#include compat/pipe-id.h +#include strbuf.h + +const char

Re: File Hash for Windows executable

2015-08-10 Thread Johannes Schindelin
Hi Ryan, On 2015-08-10 15:54, Kiser, Ryan Lee wrote: I've downloaded the Windows installer for Git, Which one. but can't seem to find hashes published anywhere for verification. Since the downloaded file doesn't seem to be signed, The newest ones from https://git-for-windows.github.io/

Re: [PATCH bc/connect-plink] t5601-clone: remove broken and pointless check for plink.exe

2015-08-12 Thread Johannes Schindelin
Hi Johannes, On 2015-08-11 22:51, Johannes Sixt wrote: Invoking plink requires special treatment, and we have support and even test cases for the commands 'plink' and 'tortoiseplink'. We also support .exe variants for these two and there is a test for 'plink.exe'. On Windows, however, where

Re: [msysGit] [PATCH nd/dwim-wildcards-as-pathspecs] t2019: skip test requiring '*' in a file name non Windows

2015-08-12 Thread Johannes Schindelin
Hi, On 2015-08-11 22:38, Johannes Sixt wrote: diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh index 8396320..199b22d 100755 --- a/t/t2019-checkout-ambiguous-ref.sh +++ b/t/t2019-checkout-ambiguous-ref.sh @@ -69,7 +69,7 @@ test_expect_success 'wildcard

Re: Bug report Windows 10

2015-08-10 Thread Johannes Schindelin
Hi, On 2015-08-10 14:26, MS-Informatique wrote: My Windows notebook got updated to Windows 10 and now my Git Bash doesn't start and when I open an existing repository from Git Gui, I am getting next error: 0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487

Re: [PATCH] config.mak.uname: Cygwin: Use renames for creation

2015-08-09 Thread Johannes Schindelin
Hi Adam, On 2015-08-09 04:01, Adam Dinwoodie wrote: I do not see any difference between the situation here and the situation for MinGW, which is fundamentally a Cygwin fork, but which already has this build option set for it in config.mak.uname. This is incorrect. MinGW is distinctly *not* a

Re: Indenting lines starting with die in shell after ||

2015-07-27 Thread Johannes Schindelin
Hi Christian, On 2015-07-27 11:20, Christian Couder wrote: It looks like we are very inconsistent in shell scripts about indenting lines starting with die after a line that ends with ||, like: quite long command || die command failed For example in git-rebase--interactive.sh, there is

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-22 Thread Johannes Schindelin
Hi, On 2015-07-20 18:07, Junio C Hamano wrote: Johannes Sixt j...@kdbg.org writes: I really wonder why the previous file+ mv -f file+ file dance needs to be replaced? The sed must be replaced because some versions on Solaris choke on the incomplete last line in the file. Switching

Re: Git doesn't detect change, if file modification time is restored to original one

2015-07-23 Thread Johannes Schindelin
Hi, On 2015-07-23 09:29, Konrád Lőrinczi wrote: I wrote a search replace perl script, which recursively searches files and replaces text in them. After replace, it restores original modification time (mtime) of file. Since this is almost identical to

Re: [PATCH] diff-tree: do not show the sha1 of the given head with --quiet

2015-07-22 Thread Johannes Schindelin
On 2015-07-22 11:29, Sebastian Schuberth wrote: --quite is documented to Disable all output of the program. s/--quite/quiet/ -- 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] Fix detection of uname failure

2015-07-17 Thread Johannes Schindelin
Hi Charles, On 2015-07-17 14:11, Charles Bailey wrote: diff --git a/dir.c b/dir.c index 8209f8b..52dbfd0 100644 --- a/dir.c +++ b/dir.c @@ -1848,7 +1848,7 @@ static const char *get_ident_string(void) if (sb.len) return sb.buf; - if (uname(uts)) + if

Re: [PATCH] userdiff: add support for Fountain documents

2015-07-17 Thread Johannes Schindelin
Hi Zoë, On 2015-07-17 13:59, Zoë Blade wrote: Add support for Fountain, a plain text screenplay format. In the structure of a screenplay, scenes are roughly analogous to functions, in the sense that it makes your job slightly easier if you can see which ones were changed in a given range

Re: AW: unable to remap error with git svn after upgrade to Win10

2015-07-14 Thread Johannes Schindelin
Hi Christoph, On 2015-07-13 14:24, Christoph Murczek wrote: Just wanted to let you know: a re-install of git also fixed the problem. That is probably because your original report (which I do not quote because that was made too inconvenient by top-posting, sorry) suggests that the culprit was

Re: AW: AW: unable to remap error with git svn after upgrade to Win10

2015-07-15 Thread Johannes Schindelin
Hi Christoph, On 2015-07-14 23:04, Christoph Murczek wrote: thanks for explaining why re-installing fixed my problem. Although I still can't wrap my head around why it happened in the first place. It could only be caused by Windows moving the base address of one, but not the other thus

Re: [PATCH] userdiff: add support for Fountain documents

2015-07-17 Thread Johannes Schindelin
Hi Zoë, On 2015-07-17 16:03, Zoë Blade wrote: On 17 Jul 2015, at 14:03, Johannes Schindelin johannes.schinde...@gmx.de wrote: Maybe you want to add a paragraph explaining a bit more about Fountain, or at least link to http://fountain.io/? In any case, you will need to sign off on your

Re: [PATCH v2] Fix detection of uname failure

2015-07-18 Thread Johannes Schindelin
Hi Junio, On 2015-07-17 23:39, Junio C Hamano wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-07-17 19:09, Charles Bailey wrote: From: Charles Bailey cbaile...@bloomberg.net According to POSIX specification uname must return -1 on failure and a non-negative value

Re: [PATCH v2] Fix detection of uname failure

2015-07-17 Thread Johannes Schindelin
for success. In particular, Solaris returns 1. Signed-off-by: Charles Bailey cbaile...@bloomberg.net Acked-by: Johannes Schindelin johannes.schinde...@gmx.de -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

5th release candidate of Git for Windows 2.x, was Re: 4th release candidate of Git for Windows 2.x

2015-07-18 Thread Johannes Schindelin
Hi all, I just uploaded the 5th release candidate for the upcoming Git for Windows 2.x release. Please find the download link here: https://git-for-windows.github.io/#download Apart from synchronizing with Git 2.4.6, this version brings the following fixes: * Git for Windows handles

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-19 Thread Johannes Schindelin
Hi, On 2015-07-19 08:54, Johannes Sixt wrote: Am 18.07.2015 um 17:21 schrieb Ben Walton: test_expect_success clone ssh://$tuah/home/user/repo test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo diff --git a/t/t9500-gitweb-standalone-no-errors.sh

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