Re: Windows Bluescreen

2015-02-11 Thread Chris Packham
Hi Erik, On Tue, Feb 10, 2015 at 9:12 AM, wrote: > > I find that preview 1.8 is bluescreening on about 1 of 3 ssh pushes. 1.9 > preview 12-17-2014 doesn't even bluescreen, the windows gui locks until > reset. Does this mean that pushing over git:// file:// and http:// are unaffected? Can you s

Announcing git-cinnabar 0.1.0 (Was: Announcing a new (prototype) git-remote-hg tool)

2015-02-11 Thread Mike Hommey
Hi, Cinnabar is the common natural form in which mercury can be found on Earth. It contains mercury sulfide and its powder is used to make the vermillion pigment. What does that have to do with git? Hint: mercury. Git-cinnabar is a git remote helper to interact with mercurial repositories. It a

Re: [PATCH v2] merge-file: correctly open files when in a subdir

2015-02-11 Thread Aleksander Boruch-Gruszecki
>> const char *filename = argv[0]; >> -FILE *f = to_stdout ? stdout : fopen(filename, "wb"); >> +const char *fpath = prefix_filename(prefix, prefixlen, argv[0]); >> +FILE *f = to_stdout ? stdout : fopen(fpath, "wb"); >> >> if (!f) >> ret = erro

Re: Gmail Message rejection

2015-02-11 Thread Matthieu Moy
Stefan Beller writes: > Trying to send from an Android Gmail client. Though the option was > called "answer inline". ... and still sends multipart text/html message, sorry. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: EOL handling (EGit/svn/Windows)

2015-02-11 Thread Piotr Krukowiecki
On Tue, Feb 10, 2015 at 4:32 PM, Torsten Bögershausen wrote: > On 2015-02-10 11.52, Piotr Krukowiecki wrote: >> >> So far: >> 1. msysgit can't checkout a one file (saying filename too long, the >> relative path has 215 bytes) - probably not related to EOL issue. >> Cygwin git works ok. So I did no

Re: Windows Bluescreen

2015-02-11 Thread Erik Friesen
Pushing over http and https are unaffected.. My linux nas died, so on rebuild I tried to do the ssh thing, and realized quite soon that things weren't right. As far as other uses of ssh, I don't know, I use putty frequently, but I am not clear if it is using the same libraries or not. I hunted a

Re: [PATCH] index-pack: reduce memory footprint a bit

2015-02-11 Thread matthew sporleder
On Tue, Feb 10, 2015 at 12:49 PM, Junio C Hamano wrote: > matthew sporleder writes: > >> I'm having trouble getting this new patch to apply. > > Apply the first one, replace all object_entry_extra with > object_stat, replace all objects_extra with obj_stat and amend the > first one. Then apply t

Re: [PATCH] index-pack: reduce memory footprint a bit

2015-02-11 Thread Duy Nguyen
On Wed, Feb 11, 2015 at 8:01 PM, matthew sporleder wrote: > On Tue, Feb 10, 2015 at 12:49 PM, Junio C Hamano wrote: >> matthew sporleder writes: >> >>> I'm having trouble getting this new patch to apply. >> >> Apply the first one, replace all object_entry_extra with >> object_stat, replace all o

Re: [PATCH 06/11] commit: add tests of commit races

2015-02-11 Thread Michael Haggerty
On 02/10/2015 08:12 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty >> wrote: >> >>> +# Copyright (c) 2014 Michael Haggerty >> >> What is the projects stance on copyright lines? > > I do not think we have a strong one. > >> I've seen fi

Re: [PATCH 04/11] ref_transaction_update(): remove "have_old" parameter

2015-02-11 Thread Michael Haggerty
On 02/09/2015 07:20 PM, Stefan Beller wrote: > On Sun, Feb 8, 2015 at 8:13 AM, Michael Haggerty wrote: >> Instead, if old_sha1 is non-NULL, verify it; otherwise, don't. > > parsing error on that commit message. I needed to read the code to understand > what you want to say here. Thanks for the c

Re: [PATCH 07/11] commit: avoid race when creating orphan commits

2015-02-11 Thread Michael Haggerty
On 02/09/2015 07:35 PM, Stefan Beller wrote: > On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty wrote: >> If, during the initial check, HEAD doesn't point at anything, then we > > Maybe > "If HEAD doesn't point at anything during the initial check, then..." ? > (Being a non native speaker is hard

Re: EOL handling (EGit/svn/Windows)

2015-02-11 Thread Piotr Krukowiecki
On Tue, Feb 10, 2015 at 6:49 AM, Torsten Bögershausen wrote: > add that to the repo, do the normalization and push. I did LF normalization over history. Looks like everything worked correctly, just wondering, what does the WARNING mean? $ git filter-branch --tree-filter '~/fix-eol.sh' -d /dev/s

По вашему запросу высылаем

2015-02-11 Thread Рябова Веста
Услуги отправки писем Реально низкие цены Огромный выбор em@il баз Изготовление рекламного шаблона бесплатно Вы получаете заказы заказчиков в день обращения КИБЕРПАРТИЗАН.РФ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mo

Re: [PATCH 10/11] ref_transaction_verify(): new function to check a reference's value

2015-02-11 Thread Michael Haggerty
On 02/09/2015 07:50 PM, Stefan Beller wrote: > On Sun, Feb 8, 2015 at 8:14 AM, Michael Haggerty wrote: >> /* >> - * Add a reference update to transaction. new_sha1 is the value that >> - * the reference should have after the update, or null_sha1 if it should >> - * be deleted. If old_sha1 is no

Keep original author with git merge --squash?

2015-02-11 Thread David Glasser
I frequently find myself using `git merge --squash` to combine a series of commits by the same author into one. (For example, I fetch my project's GitHub PRs into my repo. Frequently, a PR consists of the original PR (with a good description) followed by a few follow-ups based on feedback from me.

Re: [PATCH 06/11] commit: add tests of commit races

2015-02-11 Thread Junio C Hamano
Michael Haggerty writes: > On the other hand, there's this [1] and this [2] from the FSF, which > recommend a copyright blurb at the beginning of every source file. > Though actually the recommendation is to include a GPL blurb too, not > just a naked copyright line like I used. But I get the fee

Re: [PATCH v2] merge-file: correctly open files when in a subdir

2015-02-11 Thread Junio C Hamano
Aleksander Boruch-Gruszecki writes: >>> @@ -72,6 +72,12 @@ test_expect_success 'works in subdirectory' ' >>> ( cd dir && git merge-file a.txt o.txt b.txt ) >>> ' >>> >>> +mkdir -p dir/deep >>> +cp new1.txt orig.txt new2.txt dir/deep >>> +test_expect_success 'accounts for subdirectory when w

Re: [PATCH 06/11] commit: add tests of commit races

2015-02-11 Thread Stefan Beller
On Wed, Feb 11, 2015 at 10:10 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> On the other hand, there's this [1] and this [2] from the FSF, which >> recommend a copyright blurb at the beginning of every source file. >> Though actually the recommendation is to include a GPL blurb too, n

Re: [PATCH] config: add show_err flag to git_config_parse_key()

2015-02-11 Thread Junio C Hamano
Jeff King writes: > On Wed, Feb 11, 2015 at 01:15:05AM +0530, Tanay Abhra wrote: > >> I just saw your mail late in the night (I didn't had net for a week). >> This patch just squelches the error message, I will take a better >> look tomorrow morning. > > Thanks, this is probably a good first step

Re: [PATCH 06/11] commit: add tests of commit races

2015-02-11 Thread Junio C Hamano
Stefan Beller writes: > Quoting from wikipedia[1] > > (note however that when the United States joined the Convention > in 1988, it continued to make statutory damages and attorney's fees > only available for registered works). > > Does that mean if somebody would infringe the GPL on git (e.g. se

Re: [PATCH v2] merge-file: correctly open files when in a subdir

2015-02-11 Thread Junio C Hamano
Junio C Hamano writes: > Thanks, that makes sense and it also makes sense that checking the > resulting content in dir/a.txt would make sense. Then we many not > need to add a new dir/deep/* test---after all they are checking the > same thing. Here is what I have right now, queued somewhere in

https://docs.google.com/file/d/0B9nj3tAxC2ooc3lhQ2...

2015-02-11 Thread 7064459231
https://docs.google.com/file/d/0B9nj3tAxC2ooc3lhQ2RDVmp4cFE/edit?usp=docslist_api -- 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: read() MAX_IO_SIZE bytes, more than SSIZE_MAX?

2015-02-11 Thread Junio C Hamano
Eric Sunshine writes: > A bit cleaner: > > #ifndef(MAX_IO_SIZE) > # define MAX_IO_SIZE_DEFAULT (8*1024*1024) > # if defined(SSIZE_MAX) && (SSIZE_MAX < MAX_IO_SIZE_DEFAULT) > # define MAX_IO_SIZE SSIZE_MAX > # else > # define MAX_IO_SIZE MAX_IO_SIZE_DEFAULT > # endif > #endif OK, then let's do

Re: [PATCH v2] merge-file: correctly open files when in a subdir

2015-02-11 Thread Aleksander Boruch-Gruszecki
> Here is what I have right now, queued somewhere in 'pu', after > fixing it up a bit. That's awesome! Thanks for your help :) -- 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/majo

Re: [PATCH 01/24] dir.c: optionally compute sha-1 of a .gitignore file

2015-02-11 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > -int add_excludes_from_file_to_list(const char *fname, > -const char *base, > -int baselen, > -struct exclude_list *el, > -int check_inde

Re: read() MAX_IO_SIZE bytes, more than SSIZE_MAX?

2015-02-11 Thread Joachim Schmitz
Junio C Hamano pobox.com> writes: > OK, then let's do this. > Yep, that'd do, thanks. bye, Jojo -- 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

Увеличьте доходы в бизнесе

2015-02-11 Thread Куликова Капитолина
Вам нужно увеличивать продажи? http://bit.ly/1M9HAVu -- 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: read() MAX_IO_SIZE bytes, more than SSIZE_MAX?

2015-02-11 Thread Joachim Schmitz
Joachim Schmitz schmitz-digital.de> writes: > > Junio C Hamano pobox.com> writes: > > > > OK, then let's do this. > > Except for the type "taht" -- 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

[poll] does anybody depend on RelNotes being a symbolic link?

2015-02-11 Thread Junio C Hamano
I am wondering if I can turn the top-level RelNotes symbolic link into a regular file. The benefit for doing that is that I can start the file like so: Git Release Notes == Updates since v2.3 early in the cycle and then later decide if we want to make the ne

Re: [PATCH 8/8] reflog_expire(): lock symbolic refs themselves, not their referent

2015-02-11 Thread Junio C Hamano
Stefan Beller writes: > On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty wrote: >> When processing the reflog of a symbolic ref, hold the lock on the >> symbolic reference itself, not on the reference that it points to. > > I am not sure if that makes sense. > So when expiring HEAD, you want to

Re: read() MAX_IO_SIZE bytes, more than SSIZE_MAX?

2015-02-11 Thread Junio C Hamano
Joachim Schmitz writes: > Joachim Schmitz schmitz-digital.de> writes: > >> >> Junio C Hamano pobox.com> writes: >> >> >> > OK, then let's do this. >> > > > > Except for the type "taht" Also #ifndef part X-< Here is what I queued for the day. -- >8 -- Subject: xread/xwrite: clip MAX_IO_S

Re: [PATCH 8/8] reflog_expire(): lock symbolic refs themselves, not their referent

2015-02-11 Thread Stefan Beller
On Wed, Feb 11, 2015 at 2:49 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty >> wrote: >>> When processing the reflog of a symbolic ref, hold the lock on the >>> symbolic reference itself, not on the reference that it points to. >> >> I am

What's cooking in git.git (Feb 2015, #03; Wed, 11)

2015-02-11 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Git 2.3 is out, and the first batch of topics that have been cooking in the 'next' branch are now in the 'master' branch. The 'next' branch wil

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

2015-02-11 Thread Karsten Blees
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 a value in the past. [1] I believe (or rather hope) that all involved in the discussion agree that G

[PATCH 1/3] Win32: make FILETIME conversion functions public

2015-02-11 Thread Karsten Blees
Signed-off-by: Karsten Blees --- compat/mingw.c | 16 compat/mingw.h | 16 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 70f3191..ba3cfb0 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -419,22 +419,6 @

[PATCH 2/3] Win32: replace MSVCRT's fstat() with a Win32-based implementation

2015-02-11 Thread Karsten Blees
fstat() is the only stat-related CRT function for which we don't have a full replacement yet (and thus the only reason to stick with MSVCRT's 'struct stat' definition). Fully implement fstat(), in preparation of implementing a POSIX 2013 compatible 'struct stat' with nanosecond-precision file time

[PATCH 3/3] Win32: implement nanosecond-precision file times

2015-02-11 Thread Karsten Blees
We no longer use any of MSVCRT's stat-functions, so there's no need to stick to a CRT-compatible 'struct stat' either. Define and use our own POSIX-2013-compatible 'struct stat' with nanosecond- precision file times. Signed-off-by: Karsten Blees --- compat/mingw.c | 12 ++-- compat/mi

Re: Relative paths don't work in .gitignore as would be expected.

2015-02-11 Thread /#!/JoePea
+git@vger.kernel.org, plain text I would say just use zsh globbing, it has the double star, but it'd likely too late for that. You'd add a single rule: ignore any files that are in a directory higher up than the .gitignore where the rule is found. Then if you have a git repo in your fs at /git/re

Re: read() MAX_IO_SIZE bytes, more than SSIZE_MAX?

2015-02-11 Thread Joachim Schmitz
Sorry to be a pain, but i think this sententence neede mending + * to override this, if the definition of SSIZE_MAX platform is broken. Bye, Jojo