Re: [PATCH 0/5] Use watchman to reduce index refresh time

2015-11-02 Thread Paolo Ciarrocchi
On Sun, Nov 1, 2015 at 2:55 PM, Nguyễn Thái Ngọc Duy wrote: Hi Duy, > This series builds on top of the index-helper series I just sent and > uses watchman to keep track of file changes in order to avoid lstat() > at refresh time. The series can also be found at [1] > > When I

git log --author=me

2015-11-02 Thread Harry Jeffery
Hi, I've written a patch that allows `me` to be used as shorthand for $(user.name) or $(user.email) in the `--author` and `--commiter` fields. The purpose being to make finding your own commits quicker and easier: git log --author=me Is this a change that would be accepted if submitted?

Re: When a file was locked by some program, git will work stupidly

2015-11-02 Thread Mr Guillaume Seren
Quoting dayong xie (2015-11-02 05:56:55) > To be specific > In my Unity project, there is a native plugin, and plugin's extension > is .dll, and this plugin is > under git version control, when Unity is running, the plugin file will > be locked. > If i merge another branch, which contains

Re: [PATCH v4] Add git-grep threads param

2015-11-02 Thread Junio C Hamano
Victor Leschuk writes: > do we have any objections on this patch? The question you should be asking is "do we have any support". It is not like the default for any series is to be included; it is quite the opposite. "Is this worth having in our tree?" is the

RE: When a file was locked by some program, git will work stupidly

2015-11-02 Thread Randall S. Becker
On November-01-15 11:57 PM dayong xie wrote: >To be specific >In my Unity project, there is a native plugin, and plugin's extension is >.dll, >and this plugin is under git version control, when Unity is running, >the plugin >file will be locked. >If i merge another branch, which contains

Re: Anonymous commit (empty Author and Committer)

2015-11-02 Thread Lennart Sorensen
On Sat, Oct 31, 2015 at 08:24:06AM +0300, Andrei Borzenkov wrote: > If we decide to fix this commit it is better done now, while it is the last > one. It is annoying but do you have suggestion how it can be done > differently? Well the only options are: 1) Leave it alone 2) Break the tree of

Re: [PATCH v5 25/26] refs: break out ref conflict checks

2015-11-02 Thread Michael Haggerty
On 10/28/2015 03:14 AM, David Turner wrote: > Create new function verify_no_descendants, to hold one of the ref > conflict checks used in verify_refname_available. Multiple backends > will need this function, so it goes in the common code. > > rename_ref_available also moves to the common code,

Re: git log --author=me

2015-11-02 Thread Junio C Hamano
Andreas Schwab writes: > Harry Jeffery writes: > >> The purpose being to make finding your own commits quicker and easier: >> git log --author=me > > Since --author does a regexp search, this would most likely break > someone's searches. Better

announcing git-svnsync (server-side GIT↔SVN sync)

2015-11-02 Thread Anthony Baire
Hi, today we are announcing the first release of git-svnsync http://git-svnsync.gforge.inria.fr/ Git-svnsync is a bi-directional server-side synchronisation tool between a git and a subversion repository. It is based on hooks and it is designed to allow a smooth transition of projects from

Re: git log --author=me

2015-11-02 Thread Duy Nguyen
On Mon, Nov 2, 2015 at 2:27 PM, Harry Jeffery wrote: > Hi, > > I've written a patch that allows `me` to be used as shorthand for > $(user.name) or $(user.email) in the `--author` and `--commiter` fields. > > The purpose being to make finding your own commits quicker and

Re: git filter-branch and merging of signed tags

2015-11-02 Thread Michael J Gruber
Uwe Kleine-König venit, vidit, dixit 02.11.2015 09:04: > Hello, > > Consider I want to rewrite a commit that is a merge of a signed tag. In > my case that's 064ca93f7ab927c2752d86fc5727716e340d737c that currently > sits in linux-next: > > ~/gsrc/linux$ git version > git version 2.6.1

Re: Anonymous commit (empty Author and Committer)

2015-11-02 Thread Junio C Hamano
"Lennart Sorensen" writes: > On Sat, Oct 31, 2015 at 08:24:06AM +0300, Andrei Borzenkov wrote: >> If we decide to fix this commit it is better done now, while it is the last >> one. It is annoying but do you have suggestion how it can be done >> differently? > >

Re: git log --author=me

2015-11-02 Thread Andreas Schwab
Harry Jeffery writes: > The purpose being to make finding your own commits quicker and easier: > git log --author=me Since --author does a regexp search, this would most likely break someone's searches. Better add a new option for that functionality. Andreas. --

Re: git log --author=me

2015-11-02 Thread Matthieu Moy
Junio C Hamano writes: > Andreas Schwab writes: > >> Harry Jeffery writes: >> >>> The purpose being to make finding your own commits quicker and easier: >>> git log --author=me >> >> Since --author does a regexp search, this

[PATCH v6 07/25] refs: move the hidden refs functions to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Move the hidden refs functions to refs/refs.c since these functions do not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

[PATCH v6 22/25] initdb: make safe_create_dir public

2015-11-02 Thread Michael Haggerty
From: David Turner Soon we will want to create initdb functions for ref backends, and code from initdb that calls this function needs to move into the files backend. So this function needs to be public. Signed-off-by: David Turner

[PATCH v6 17/25] refs: move transaction functions to the common code

2015-11-02 Thread Michael Haggerty
From: David Turner The common ref code will build up a ref transaction. Backends will then commit it. So the transaction creation and update functions should be in the common code. The backends will also need access to some constants and structs that, until now, were

[PATCH v6 10/25] refs: move read_ref, read_ref_full and ref_exists to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg These functions do not depend on the backend implementation so move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

[PATCH v6 05/25] refs: move delete_pseudoref and delete_ref to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Move delete_pseudoref() and delete_ref() to refs/refs.c since these functions do not contain any backend specific code. We can't move delete_refs yet because it depends on the files-backend-specific repack_without_refs. Signed-off-by: David Turner

[PATCH v6 09/25] refs: move warn_if_dangling_symref* to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg These functions do not use any backend specific code so move them to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

[PATCH v6 23/25] files_log_ref_write: new function

2015-11-02 Thread Michael Haggerty
From: David Turner Because HEAD and stash are per-worktree, every refs backend needs to go through the files backend to write these refs. So create a new function, files_log_ref_write, and add it to refs/refs-internal.h. Later, we will use this to handle reflog updates

Re: Watchman/inotify support and other ways to speed up git status

2015-11-02 Thread Christian Couder
On Tue, Nov 3, 2015 at 6:45 AM, Duy Nguyen wrote: > On Mon, Nov 2, 2015 at 9:56 PM, David Turner wrote: >> On Thu, 2015-10-29 at 09:10 +0100, Christian Couder wrote: >>> > We're using Watchman at Twitter. A week or two ago posted a dump of our >>> >

Re: git.git as of tonight

2015-11-02 Thread Johannes Sixt
Am 03.11.2015 um 00:06 schrieb Stefan Beller: On Mon, Nov 2, 2015 at 1:15 PM, Johannes Sixt wrote: run-command.c: In function 'set_nonblocking': run-command.c:1011: error: 'F_GETFL' undeclared (first use in this function) run-command.c:1011: error: (Each undeclared identifier is

[PATCH v6 04/25] refs: move update_ref to refs/refs.c

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Move update_ref() to refs/refs.c since this function does not contain any backend specific code. Move the ref classifier functions and write_pseudoref as well, since update_ref depends on them. Signed-off-by: Ronnie Sahlberg

[PATCH v6 19/25] refs: move copy_msg to the common code

2015-11-02 Thread Michael Haggerty
From: David Turner Rename copy_msg to copy_reflog_msg and add it to refs/refs-internal.h. Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty ---

[PATCH v6 21/25] refs: move should_autocreate_reflog to common code

2015-11-02 Thread Michael Haggerty
From: David Turner Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty --- refs/files-backend.c | 10 -- refs/refs-internal.h | 2 ++ refs/refs.c

[PATCH v6 20/25] refs: move peel_object to the common code

2015-11-02 Thread Michael Haggerty
From: David Turner This function does not contain any backend specific code so move it to the common code. Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty

[PATCH v6 06/25] refs: move read_ref_at to the common refs file

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Move read_ref_at() to refs/refs.c since this function does not contain any backend specific code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

[PATCH v6 03/25] refs: add a new file, refs/refs.c, to hold common refs code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Create a new file, refs/refs.c, that will be used to hold all the refs code that is backend agnostic and can be used across all backends. Signed-off-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano

[PATCH v6 00/25] refs backend pre-vtable

2015-11-02 Thread Michael Haggerty
This is a proposed revision of David Turner's refs-backend-pre-vtable v5 [1]. It incorporates all of the changes I suggested when reviewing that series, plus it moves the refs-related code to a subdirectory and creates a new header file refs/refs-internal.h for declarations meant to be used within

[PATCH v6 14/25] refs: move prettify_refname to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty --- refs/files-backend.c | 9 - refs/refs.c | 9 + 2 files changed, 9

[PATCH v6 01/25] refs: make is_branch public

2015-11-02 Thread Michael Haggerty
From: David Turner is_branch was already non-static, but this patch declares it in the header. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by:

[PATCH v6 12/25] refs: move check_refname_format to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg This function does not contain any backend specific code so move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

[PATCH v6 02/25] refs/files-backend.c: new file, renamed from refs.c

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg We are about to split up the reference code into multiple source files, to separate the generic code from the code that is specific to the current files-based backend. To keep things organized, we will move the reference-related code to a subdirectory,

[PATCH v6 25/25] refs: break out ref conflict checks

2015-11-02 Thread Michael Haggerty
From: David Turner Create new function verify_no_descendants, to hold one of the ref conflict checks used in verify_refname_available. Multiple backends will need this function, so move it to the common code. Also move rename_ref_available to the common code, because

[PATCH v6 15/25] refs: move ref iterators to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano Signed-off-by: David Turner Signed-off-by: Michael Haggerty --- refs/files-backend.c | 81

[PATCH v6 13/25] refs: move is_branch to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty --- refs/files-backend.c | 5 -

[PATCH v6 16/25] refs: move head_ref_namespaced to the common code

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: Junio C Hamano Signed-off-by: Michael Haggerty --- refs/files-backend.c | 15 --- refs/refs.c | 15 +++ 2

[PATCH v6 18/25] refs: move refname_is_safe to the common code

2015-11-02 Thread Michael Haggerty
From: David Turner This function does not contain any backend specific code, so move it to the common code. This function might be used by other refs backends. While we are doing so, improve the comment's grammar and clarify a safety rule. Signed-off-by: Ronnie

[PATCH v6 11/25] refs: move resolve_refdup to common

2015-11-02 Thread Michael Haggerty
From: Ronnie Sahlberg This function can be shared across all refs backends so move it to the common code. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner Signed-off-by: Junio C Hamano

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 08:08:26PM +0100, Nguyễn Thái Ngọc Duy wrote: > $X/gitdir is created, or refreshed, in order to keep a linked worktree > from being pruned. But while git file is used as the foundation for > linked worktrees, it's used for other purposes as well and we should > not create

[PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Nguyễn Thái Ngọc Duy
$X/gitdir is created, or refreshed, in order to keep a linked worktree from being pruned. But while git file is used as the foundation for linked worktrees, it's used for other purposes as well and we should not create $X/gitdir in those cases. Tighten the check. Only update an existing file,

Re: [PATCH 0/5] Use watchman to reduce index refresh time

2015-11-02 Thread Duy Nguyen
On Mon, Nov 2, 2015 at 3:54 PM, Paolo Ciarrocchi wrote: > On Sun, Nov 1, 2015 at 2:55 PM, Nguyễn Thái Ngọc Duy > wrote: > > Hi Duy, > >> This series builds on top of the index-helper series I just sent and >> uses watchman to keep track of file

Re: [PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 02:36:26PM -0500, David Turner wrote: > A HTTP server is permitted to return a non-range response to a HTTP > range request (and Apache httpd in fact does this in some cases). > While libcurl knows how to correctly handle this (by skipping bytes > before and after the

[PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread David Turner
A HTTP server is permitted to return a non-range response to a HTTP range request (and Apache httpd in fact does this in some cases). While libcurl knows how to correctly handle this (by skipping bytes before and after the requested range), it only turns on this handling if it is aware that a

Cant download Git for Mac

2015-11-02 Thread MH
I am trying to download Git and when I try it says “downloading” but it isn’t/ There is an option to download from source forge but I have been told that is not a good idea. Any reason Git is not downloading from git.scm/downloads? Thank you. MH-- To unsubscribe from this list: send the line

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Eric Sunshine
On Mon, Nov 2, 2015 at 2:08 PM, Nguyễn Thái Ngọc Duy wrote: > $X/gitdir is created, or refreshed, in order to keep a linked worktree > from being pruned. But while git file is used as the foundation for > linked worktrees, it's used for other purposes as well and we should >

[PATCH 1/2] Limit the size of the data block passed to SHA1_Update()

2015-11-02 Thread atousa . p
From: Atousa Pahlevan Duprat Some implementations of SHA_Updates have inherent limits on the max chunk size. SHA1_MAX_BLOCK_SIZE can be defined to set the max chunk size supported, if required. This is enabled for OSX CommonCrypto library and set to 1GiB. Signed-off-by:

Re: [PATCH v5 00/26] refs backend pre-vtable

2015-11-02 Thread Michael Haggerty
On 10/28/2015 03:14 AM, David Turner wrote: > This version of the series makes some minor changes from v4: > > refs.c: move refname_is_safe to the common code: clarify a comment > initdb: move safe_create_dir into common code: add a caveat on safe_create_dir > refs.c: move update_ref to refs.c:

Re: Watchman/inotify support and other ways to speed up git status

2015-11-02 Thread Duy Nguyen
On Mon, Nov 2, 2015 at 9:56 PM, David Turner wrote: > On Thu, 2015-10-29 at 09:10 +0100, Christian Couder wrote: >> > We're using Watchman at Twitter. A week or two ago posted a dump of our >> > code to github, but I would advise waiting a day or two to use it, as >> >

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Duy Nguyen
(resend) On Mon, Nov 2, 2015 at 9:51 PM, Junio C Hamano wrote: > Jeff King writes: > >> [2] I suspect this code should use write_file_gently(). What happens if >> I have a read-only linked checkout? I can't hide anything from you guys can I? :) My first

git filter-branch and merging of signed tags

2015-11-02 Thread Uwe Kleine-König
Hello, Consider I want to rewrite a commit that is a merge of a signed tag. In my case that's 064ca93f7ab927c2752d86fc5727716e340d737c that currently sits in linux-next: ~/gsrc/linux$ git version git version 2.6.1 ~/gsrc/linux$ git checkout

Re: configure: -lpthread doesn't belong in CFLAGS

2015-11-02 Thread Matthieu Moy
"Rainer M. Canavan" writes: > Hi, Hi, Thanks for the patch. However, it will need a bit more work to be integrated into git.git. Please, read https://github.com/git/git/blob/master/Documentation/SubmittingPatches The body of your email should end up being the commit message.

[PATCH v3 0/2]

2015-11-02 Thread Knut Franke
Changes in the third iteration: * don't break support for curl < 7.10.7 * fix some memory leaks * explicitly set anyauth as fallback for unsupported proyx authmethod setting, and tell the user what we did * clean up usage of curl version #ifdefs * fix more code formatting / style / naming

Re: git filter-branch and merging of signed tags

2015-11-02 Thread Uwe Kleine-König
Hello Michael, On Mon, Nov 02, 2015 at 05:21:03PM +0100, Michael J Gruber wrote: > Uwe Kleine-König venit, vidit, dixit 02.11.2015 09:04: > > ~/gsrc/linux$ git version > > git version 2.6.1 > > Does your git include > a5a4b3f (filter-branch: remove multi-line headers in msg filter, >

[PATCH 1/2] http: allow selection of proxy authentication method

2015-11-02 Thread Knut Franke
CURLAUTH_ANY does not work with proxies which answer unauthenticated requests with a 307 redirect to an error page instead of a 407 listing supported authentication methods. Therefore, allow the authentication method to be set using the environment variable GIT_HTTP_PROXY_AUTHMETHOD or

[PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-02 Thread Knut Franke
Currently, the only way to pass proxy credentials to curl is by including them in the proxy URL. Usually, this means they will end up on disk unencrypted, one way or another (by inclusion in ~/.gitconfig, shell profile or history). Since proxy authentication often uses a domain user, credentials

Contact me

2015-11-02 Thread Richard Sun
Hello, My name is Mr. Richard Sun from Hong Kong. I want you to be my partner in a business project. Contact me back via my private e-mail address for more details; ricadt...@ymail.com Thank you Richard Sun. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [Savannah-users] Anonymous commit (empty Author and Committer)

2015-11-02 Thread Kaz Kylheku
On 02.11.2015 07:11, Lennart Sorensen wrote: On Sat, Oct 31, 2015 at 08:24:06AM +0300, Andrei Borzenkov wrote: If we decide to fix this commit it is better done now, while it is the last one. It is annoying but do you have suggestion how it can be done differently? Well the only options are:

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Junio C Hamano
Jeff King writes: > [2] I suspect this code should use write_file_gently(). What happens if > I have a read-only linked checkout? Or you may not be the owner of the repository, you think you are doing a read-only operation, and you silently end up creating a file that cannot

Re: [PATCH] Limit the size of the data block passed to SHA1_Update()

2015-11-02 Thread Atousa Duprat
In the Makefile there is the following: ifdef BLK_SHA1 SHA1_HEADER = "block-sha1/sha1.h" LIB_OBJS += block-sha1/sha1.o else ifdef PPC_SHA1 SHA1_HEADER = "ppc/sha1.h" LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o else ifdef APPLE_COMMON_CRYPTO COMPAT_CFLAGS +=

Re: Watchman/inotify support and other ways to speed up git status

2015-11-02 Thread David Turner
On Thu, 2015-10-29 at 09:10 +0100, Christian Couder wrote: > > We're using Watchman at Twitter. A week or two ago posted a dump of our > > code to github, but I would advise waiting a day or two to use it, as > > I'm about to pull a large number of bugfixes into it (I'll update this > > thread

Re: [PATCH 2/5] Add watchman support to reduce index refresh cost

2015-11-02 Thread David Turner
On Sun, 2015-11-01 at 14:55 +0100, Nguyễn Thái Ngọc Duy wrote: > The previous patch has the logic to clear bits in 'WAMA' bitmap. This > patch has logic to set bits as told by watchman. The missing bit, > _using_ these bits, are not here yet. > > A lot of this code is written by David Turner

Re: [PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 10:50:10PM +0100, Andreas Schwab wrote: > Jeff King writes: > > > 4. Fix all of the callers. I suspect this would involve calling > > fstat(fileno(fh)) to get a real off_t. > > You can also use ftello which returns off_t. Thanks, I forgot about

Re: [PATCH v4 4/9] index-helper: new daemon for caching index and related stuff

2015-11-02 Thread David Turner
On Sun, 2015-11-01 at 14:42 +0100, Nguyễn Thái Ngọc Duy wrote: > + memcpy(new_mmap, istate->mmap, istate->mmap_size - 20); > + > + /* > + * The trailing hash must be written last after everything is > + * written. It's the indication that the shared memory is now > + *

Re: [PATCH v5 18/26] refs: move transaction functions into common code

2015-11-02 Thread David Turner
On Sun, 2015-11-01 at 09:17 +0100, Michael Haggerty wrote: > On 10/28/2015 03:14 AM, David Turner wrote: > > The common ref code will build up a ref transaction. Backends will > > then commit it. So the transaction creation and update functions should > > be in the common code. We also need to

Re: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 12:51:16PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > [2] I suspect this code should use write_file_gently(). What happens if > > I have a read-only linked checkout? > > Or you may not be the owner of the repository, you think you are >

[PATCH v4] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread David Turner
A HTTP server is permitted to return a non-range response to a HTTP range request (and Apache httpd in fact does this in some cases). While libcurl knows how to correctly handle this (by skipping bytes before and after the requested range), it only turns on this handling if it is aware that a

Re: [PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread Andreas Schwab
Jeff King writes: > 4. Fix all of the callers. I suspect this would involve calling > fstat(fileno(fh)) to get a real off_t. You can also use ftello which returns off_t. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756

Re: [PATCH v4] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 04:39:58PM -0500, David Turner wrote: > A HTTP server is permitted to return a non-range response to a HTTP > range request (and Apache httpd in fact does this in some cases). > While libcurl knows how to correctly handle this (by skipping bytes > before and after the

Re: git.git as of tonight

2015-11-02 Thread Junio C Hamano
Johannes Sixt writes: > Am 02.11.2015 um 03:58 schrieb Junio C Hamano: >> * sb/submodule-parallel-fetch (2015-10-21) 14 commits >>(merged to 'next' on 2015-10-23 at 8f04bbd) >> + run-command: fix missing output from late callbacks >>... >> + submodule.c: write "Fetching

Re: git.git as of tonight

2015-11-02 Thread Johannes Sixt
Am 02.11.2015 um 03:58 schrieb Junio C Hamano: > * sb/submodule-parallel-fetch (2015-10-21) 14 commits >(merged to 'next' on 2015-10-23 at 8f04bbd) > + run-command: fix missing output from late callbacks > + test-run-command: increase test coverage > + test-run-command: test for

Re: [PATCH] Limit the size of the data block passed to SHA1_Update()

2015-11-02 Thread Junio C Hamano
Atousa Duprat writes: > On Sun, Nov 1, 2015 at 10:37 AM, Junio C Hamano wrote: >> >> Hmm, I admit that this mess is my creation, but unfortunately it >> does not allow us to say: >> >> make SHA1_MAX_BLOCK_SIZE='1024L*1024L*1024L' >> >> when using

Re: [PATCH 1/5] read-cache: add watchman 'WAMA' extension

2015-11-02 Thread David Turner
On Sun, 2015-11-01 at 14:55 +0100, Nguyễn Thái Ngọc Duy wrote: > >+#define CE_NO_WATCH (0x0001) This name seems very confusing to me. CE_NO_WATCHMAN_STAT? CE_UNKNOWN_TO_WATCHMAN? (one reason it may seem more confusing to me than to others is that Twitter's code has a concept of files that we

Re: git.git as of tonight

2015-11-02 Thread Stefan Beller
On Mon, Nov 2, 2015 at 1:15 PM, Johannes Sixt wrote: > Am 02.11.2015 um 03:58 schrieb Junio C Hamano: >> * sb/submodule-parallel-fetch (2015-10-21) 14 commits >>(merged to 'next' on 2015-10-23 at 8f04bbd) >> + run-command: fix missing output from late callbacks >> +

Re: [PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread Jeff King
On Mon, Nov 02, 2015 at 05:41:24PM -0500, David Turner wrote: > > Let's switch to using off_t, which should hold any file size > > our system is capable of storing. We need to use ftello() to > > get the off_t. This is in POSIX and hopefully available > > everywhere; if not, we should be able to

Re: [PATCH v3] http.c: use CURLOPT_RANGE for range requests

2015-11-02 Thread David Turner
On Mon, 2015-11-02 at 17:10 -0500, Jeff King wrote: > On Mon, Nov 02, 2015 at 10:50:10PM +0100, Andreas Schwab wrote: > > > Jeff King writes: > > > > > 4. Fix all of the callers. I suspect this would involve calling > > > fstat(fileno(fh)) to get a real off_t. > > > > You

Re: [PATCH 2/2] http: use credential API to handle proxy authentication

2015-11-02 Thread Junio C Hamano
Knut Franke writes: > Currently, the only way to pass proxy credentials to curl is by including them > in the proxy URL. Usually, this means they will end up on disk unencrypted, > one > way or another (by inclusion in ~/.gitconfig, shell profile or history).

Strange diff-index output

2015-11-02 Thread Ch'Gans
Hi there, We're using a script to verify that what we are building is clean against our git repository, for this we're using "git rev-parse --short HEAD" to get the current hash and "git diff-index --quiet HEAD" to check for local modification. This script works fine on developer's machines, but

Re: [PATCH 1/2] http: allow selection of proxy authentication method

2015-11-02 Thread Junio C Hamano
Knut Franke writes: > CURLAUTH_ANY does not work with proxies which answer unauthenticated requests > with a 307 redirect to an error page instead of a 407 listing supported > authentication methods. Therefore, allow the authentication method to be set > using the

Re: Cant download Git for Mac

2015-11-02 Thread Xue Fuqiao
On Tue, Nov 3, 2015 at 3:18 AM, MH wrote: > I am trying to download Git and when I try it says “downloading” but it isn’t/ Yes, I can reproduce on Firefox 41.0.2 and Google Chrome 46.0.2490.80. > There is an option to download from source forge but I have been told that is >

Re: Strange diff-index output

2015-11-02 Thread David Turner
On Tue, 2015-11-03 at 12:59 +1300, Ch'Gans wrote: > Hi there, > > We're using a script to verify that what we are building is clean > against our git repository, for this we're using "git rev-parse > --short HEAD" to get the current hash and "git diff-index --quiet > HEAD" to check for local

Re: Strange diff-index output

2015-11-02 Thread Ch'Gans
On 3 November 2015 at 13:27, David Turner wrote: > On Tue, 2015-11-03 at 12:59 +1300, Ch'Gans wrote: >> Hi there, >> >> We're using a script to verify that what we are building is clean >> against our git repository, for this we're using "git rev-parse >> --short HEAD"

Re: [PATCH 1/4] diff-highlight: add `less -r` to cmd in README

2015-11-02 Thread Junio C Hamano
Jonathan Lebon writes: > As it is, the suggested command for trying out diff-highlight will just > dump the whole git log output to the terminal. Let's pipe it through > `less` so users aren't surprised on the first try. That justifies the "less" part but not your

Re: [PATCH 1/4] diff-highlight: add `less -r` to cmd in README

2015-11-02 Thread Jonathan Lebon
On Mon, Nov 2, 2015 at 9:41 PM, Junio C Hamano wrote: > > Jonathan Lebon writes: > > > As it is, the suggested command for trying out diff-highlight will just > > dump the whole git log output to the terminal. Let's pipe it through > > `less` so users

[PATCH 4/4] diff-highlight: add maxhunksize config option

2015-11-02 Thread Jonathan Lebon
As the size of the hunk gets bigger, it becomes harder to jump back and forth between the removed and added lines, and highlighting becomes less beneficial. We add a new config option called diff-highlight.maxhunksize which controls the maximum size of the hunk allowed for which

[PATCH 1/4] diff-highlight: add `less -r` to cmd in README

2015-11-02 Thread Jonathan Lebon
As it is, the suggested command for trying out diff-highlight will just dump the whole git log output to the terminal. Let's pipe it through `less` so users aren't surprised on the first try. Signed-off-by: Jonathan Lebon --- contrib/diff-highlight/README | 6 +++--- 1

[PATCH 2/4] diff-highlight: factor out prefix/suffix functions

2015-11-02 Thread Jonathan Lebon
In preparation for the next patch, we factor out the functions for finding the common prefix and suffix between two lines. Signed-off-by: Jonathan Lebon --- contrib/diff-highlight/diff-highlight | 98 --- 1 file changed, 56

[PATCH 3/4] diff-highlight: match up lines before highlighting

2015-11-02 Thread Jonathan Lebon
As mentioned in the README, one of the current limitations of diff-highlight is that it only calculates highlights when the hunk contains the same number of removed lines as added lines. A further limitation upon this is that diff-highlight assumes that the first line removed matches the first

[PATCH 0/4] diff-highlight: make a few improvements

2015-11-02 Thread Jonathan Lebon
These patches bring a few improvements to the contrib/diff-highlight Perl script. The major improvement is done in patch 3/4, which improves diff-highlighting accuracy by implementing a recursive line matching algorithm. Please note that I have limited experience with Perl, so there may be better