Re: [PATCH v7 4/4] cache-tree: Write updated cache-tree after commit

2014-07-11 Thread Eric Sunshine
On Fri, Jul 11, 2014 at 7:22 PM, David Turner dtur...@twopensource.com wrote: During the commit process, update the cache-tree. Write this updated cache-tree so that it's ready for subsequent commands. Add test code which demonstrates that git commit now writes the cache tree. Make all tests

Re: [PATCH 3/3] tag: support configuring --sort via .gitconfig

2014-07-12 Thread Eric Sunshine
On Fri, Jul 11, 2014 at 6:55 PM, Jacob Keller jacob.e.kel...@intel.com wrote: Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller

Re: [PATCH v3] http: Add Accept-Language header if possible

2014-07-12 Thread Eric Sunshine
On Fri, Jul 11, 2014 at 12:52 PM, Yi EungJun semtlen...@gmail.com wrote: Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= - LANGUAGE=ko:en - Accept-Language: ko, en; q=0.9, *; q=0.1

Re: [PATCH v7 4/4] cache-tree: Write updated cache-tree after commit

2014-07-13 Thread Eric Sunshine
On Sun, Jul 13, 2014 at 1:22 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: + (echo p; echo 1; echo; echo s; echo n; echo y; echo q) | git commit --interactive -m foo Broken -chain. Would a printf make this more readable? printf p\n1

Re: [PATCH v3] sha1_file: do not add own object directory as alternate

2014-07-15 Thread Eric Sunshine
On Tue, Jul 15, 2014 at 7:29 AM, Ephrim Khong dr.kh...@gmail.com wrote: When adding alternate object directories, we try not to add the directory of the current repository to avoid cycles. Unfortunately, that test was broken, since it compared an absolute with a relative path.

Re: [PATCH v7 22/31] checkout: support checking out into a new working directory

2014-07-17 Thread Eric Sunshine
On Sun, Jul 13, 2014 at 12:50 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git checkout --to sets up a new working directory with a .git file pointing to $GIT_DIR/repos/id. It then executes git checkout again on the new worktree with the same arguments except --to is taken out. The second

Re: [PATCH v7 23/31] checkout: clean up half-prepared directories in --to mode

2014-07-20 Thread Eric Sunshine
On Sun, Jul 13, 2014 at 12:51 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/checkout.c | 49 +++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git

Re: [PATCH v7 23/31] checkout: clean up half-prepared directories in --to mode

2014-07-20 Thread Eric Sunshine
On Sun, Jul 20, 2014 at 7:55 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sun, Jul 13, 2014 at 12:51 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: + + junk_pid = getpid(); + atexit(remove_junk); + sigchain_push_common(remove_junk_on_signal); + if (mkdir

Re: [PATCH v7 11/31] $GIT_COMMON_DIR: a new environment variable

2014-07-22 Thread Eric Sunshine
On Sun, Jul 13, 2014 at 12:50 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This variable is intended to support multiple working directories attached to a repository. Such a repository may have a main working directory, created by either git init or git clone and one or more linked

Re: [PATCH 5/7] enforce `xfuncname` precedence over `funcname`

2014-07-23 Thread Eric Sunshine
On Wed, Jul 23, 2014 at 2:42 PM, Tanay Abhra tanay...@gmail.com wrote: t4018-diff-funcname.sh fails for the new `git_config()` which uses the configuration files caching layer internally. The test introduced in commit d64d6cdc checks that whether `xfuncname` takes s/that// precedence over

Re: [PATCH 15/15] refs.c: allow deleting refs with a broken sha1

2014-07-23 Thread Eric Sunshine
On Wed, Jul 23, 2014 at 1:03 PM, Ronnie Sahlberg sahlb...@google.com wrote: Add (back?) support to make it possible to delete refs that are broken. Add a new flag REF_ALLOWBROKEN that can be passed to the functions to lock a ref. If this flag is set we allow locking the ref even if the ref

Re: [RFC PATCH 1/3] config --global --edit: create a template file if needed

2014-07-25 Thread Eric Sunshine
On Fri, Jul 25, 2014 at 9:44 AM, Matthieu Moy matthieu@imag.fr wrote: When the user has no ~/.gitconfig file, git config --global --edit used to launch an editor on an nonexistant file name. Instead, create a file with a default content before launching the editor. The template contains

Re: [PATCH 1/4] strbuf.c: keep errno in strbuf_read_file()

2014-07-25 Thread Eric Sunshine
On Fri, Jul 25, 2014 at 6:43 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This function is used to replaced some code in the next patch that s/replaced/replace/ does this (i.e. keep the errno when read() fails) Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- strbuf.c | 7

Re: [RFC PATCH 3/3] commit: advertize config --global --edit on guessed identity

2014-07-25 Thread Eric Sunshine
On Fri, Jul 25, 2014 at 9:44 AM, Matthieu Moy matthieu@imag.fr wrote: commit: advertize config --global --edit on guessed identity s/advertize/advertise/ When the user has no user-wide configuration file, it's faster to use the newly introduced config file template than to run two

Re: [PATCH 2/4] refs.c: refactor resolve_ref_unsafe() to use strbuf internally

2014-07-25 Thread Eric Sunshine
On Fri, Jul 25, 2014 at 6:43 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: In the beginning, we had resolve_ref() that returns a buffer owned by this function. Then we started to move away from that direction because the buffer could be overwritten by the next resolve_ref() call and

Re: [RFC PATCH 1/3] config --global --edit: create a template file if needed

2014-07-25 Thread Eric Sunshine
On Fri, Jul 25, 2014 at 12:01 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: +static char *default_user_config() +{ + struct strbuf buf = STRBUF_INIT; + strbuf_addf(buf, + _(# This is Git's user-wide

Re: [PATCH v3 03/10] setup: convert setup_git_directory_gently_1 et al. to strbuf

2014-07-28 Thread Eric Sunshine
On Mon, Jul 28, 2014 at 2:26 PM, René Scharfe l@web.de wrote: Convert setup_git_directory_gently_1() and its helper functions setup_explicit_git_dir(), setup_discovered_git_dir() and setup_bare_git_dir() to use a struct strbuf to hold the current working directory. Replacing the

Re: [PATCH 1/5] refs.c: allow passing raw git_committer_info as email to _update_reflog

2014-07-28 Thread Eric Sunshine
On Mon, Jul 28, 2014 at 2:01 PM, Ronnie Sahlberg sahlb...@google.com wrote: On Fri, Jul 25, 2014 at 12:37 PM, Jonathan Nieder jrnie...@gmail.com wrote: Ronnie Sahlberg wrote: /* * Append a reflog entry for refname. If the REFLOG_TRUNCATE flag is set * this update will first truncate the

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

2014-07-30 Thread Eric Sunshine
On Monday, July 28, 2014, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. The biggest gain is not having

Re: [PATCH] pretty.c: make git_pretty_formats_config return -1 on git_config_string failure

2014-08-04 Thread Eric Sunshine
On Mon, Aug 4, 2014 at 11:45 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Tanay Abhra tanay...@gmail.com writes: `git_pretty_formats_config()` continues without checking git_config_string's return value which can lead to a SEGFAULT. Indeed, without the patch: $ git -c pretty.my=

Re: [PATCH 02/11] http-backend.c: replace `git_config()` with `git_config_get_bool()` family

2014-08-04 Thread Eric Sunshine
On Mon, Aug 4, 2014 at 2:33 PM, Tanay Abhra tanay...@gmail.com wrote: Use `git_config_get_bool()` family instead of `git_config()` to take advantage of the config-set API which provides a cleaner control flow. Signed-off-by: Tanay Abhra tanay...@gmail.com --- http-backend.c | 31

Re: [PATCH 02/11] http-backend.c: replace `git_config()` with `git_config_get_bool()` family

2014-08-06 Thread Eric Sunshine
On Wed, Aug 6, 2014 at 11:44 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Tanay Abhra tanay...@gmail.com writes: On 8/5/2014 12:29 AM, Eric Sunshine wrote: On Mon, Aug 4, 2014 at 2:33 PM, Tanay Abhra tanay...@gmail.com wrote: - if (skip_prefix(var, http., p

Re: [PATCH 1/1] git-config: git-config --list fixed when GIT_CONFIG value starts with ~/

2014-11-14 Thread Eric Sunshine
On Fri, Nov 14, 2014 at 1:29 PM, 0xAX kuleshovm...@gmail.com wrote: When we execute git config --list and $GIT_CONFIG value starts with home prefix - ~/ it produces folowing error - fatal: unable to read config file '~/.gitconfig': No such file or directory. This patch fixed it with

Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-16 Thread Eric Sunshine
On Sun, Nov 16, 2014 at 2:21 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Since time immemorial, the test of whether to set core.filemode has been done by trying to toggle the u+x bit on $GIT_DIR/config and then testing whether the change took. It is somewhat odd to use the config file for

Re: [PATCH] exec_cmd: system_path memory leak fix

2014-11-23 Thread Eric Sunshine
On Sun, Nov 23, 2014 at 2:19 PM, Alex Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alex Kuleshov kuleshovm...@gmail.com --- exec_cmd.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/exec_cmd.c b/exec_cmd.c index 698e752..7ed9bcc 100644 --- a/exec_cmd.c

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Eric Sunshine
On Mon, Nov 24, 2014 at 6:21 AM, Øystein Walle oys...@gmail.com wrote: When a commit is amended a pre-commit hook that verifies the commit's contents might not find what it's looking for if for example it looks at the differences against HEAD when HEAD~1 might be more appropriate. Inform the

Re: [PATCH 71/71] Change 'usually' to 'by default'

2014-11-24 Thread Eric Sunshine
On Mon, Nov 24, 2014 at 4:07 PM, Richard Littauer richard.litta...@gmail.com wrote: I've been confused several times by the docs when running across the word 'usually'. It is difficult to know before hand if it means 'under normal conditions' or 'by default'. I've gone through the

Re: [PATCH 2/3 v2] mailmap: use higher level string list functions

2014-11-24 Thread Eric Sunshine
On Mon, Nov 24, 2014 at 4:52 PM, Stefan Beller sbel...@google.com wrote: No functional changes intended. This commit makes user of higher level s/user/use/ and better documented functions of the string list API, so the code is more understandable. Note that also the required computational

Re: [PATCH 2/2] git-send-email: add --transfer-encoding option

2014-11-25 Thread Eric Sunshine
On Tue, Nov 25, 2014 at 9:00 AM, Paolo Bonzini bonz...@gnu.org wrote: From: Paolo Bonzini pbonz...@redhat.com The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392 details problems when applying patches with git am in a repository with CRLF line endings. In the example

Re: [PATCH v3] remote: add --fetch and --both options to set-url

2014-11-25 Thread Eric Sunshine
On Tue, Nov 25, 2014 at 6:48 AM, Peter Wu pe...@lekensteyn.nl wrote: git remote set-url knew about the '--push' option to update just the pushurl, but it does not have a similar option for update fetch URL and leave whatever was in place for the push URL. This patch adds support for a

Re: [PATCH 1/2] t7503: use write_script to generate hook scripts

2014-11-25 Thread Eric Sunshine
On Tue, Nov 25, 2014 at 5:51 PM, Øystein Walle oys...@gmail.com wrote: Signed-off-by: Øystein Walle oys...@gmail.com --- t/t7503-pre-commit-hook.sh | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh index

Re: [PATCH 0/2] pre-commit hook updates

2014-11-25 Thread Eric Sunshine
On Tue, Nov 25, 2014 at 5:51 PM, Øystein Walle oys...@gmail.com wrote: The first patch changes t/t7503-pre-commit-hook.sh to use write_script everywhere, as was suggested by Jeff King in the discussion of the previous patch. The second patch is v2 of the patch I sent earlier. I've

Re: [PATCH 2/2] commit: inform pre-commit that --amend was used

2014-11-25 Thread Eric Sunshine
On Tue, Nov 25, 2014 at 5:51 PM, Øystein Walle oys...@gmail.com wrote: When a commit is amended a pre-commit hook that verifies the commit's contents might not find what it's looking for if it looks at the differences against HEAD when HEAD~1 might be more appropriate. Inform the commit hook

Re: [PATCH 1/1] cat-file: fix a memory leak in cat_one_file

2014-11-26 Thread Eric Sunshine
On Wed, Nov 26, 2014 at 7:24 PM, Jonathan Nieder jrnie...@gmail.com wrote: Alexander Kuleshov wrote: [...] +++ b/builtin/cat-file.c @@ -68,9 +69,14 @@ static int cat_one_file(int opt, const char +buf_must_free = 1; + -if (!buf) +if (!buf) { +free(buf);

Re: [PATCHv3 2/3] mailmap: use higher level string list functions

2014-11-27 Thread Eric Sunshine
On Thu, Nov 27, 2014 at 1:44 PM, Michael Blume blume.m...@gmail.com wrote: The variable index seems to be unused/uninitialized now -- it's still printed in debug messages, but if I'm reading correctly, its contents are going to be nonsense. Nice catch. (Aside: Please don't top-post on this

Re: [PATCH] t0050-*.sh: mark the rename (case change) test as passing

2014-11-28 Thread Eric Sunshine
On Fri, Nov 28, 2014 at 11:57 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Since commit baa37bff (mv: allow renaming to fix case on case insensitive filesystems, 08-05-2014), the 'git mv' command has been able to rename a file, to one which differs only in case, on a case insensitive

Re: [PATCH 09/19] Add git-list-files, a user friendly version of ls-files and more

2014-12-01 Thread Eric Sunshine
On Sunday, November 30, 2014, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is more user friendly version of ls-files: * it's automatically colored and columnized * it refreshes the index like all porcelain commands * it defaults to non-recursive behavior like ls * :(glob) is on by

Re: [PATCH] git add -i: allow list (un)selection by regexp

2014-12-02 Thread Eric Sunshine
On Tue, Dec 2, 2014 at 12:26 PM, Junio C Hamano gits...@pobox.com wrote: Aarni Koskela aarni.kosk...@andersinnovations.com writes: From 9096652a71666920ae8d59dd4317d536ba974d5b Mon Sep 17 00:00:00 2001 From: Aarni Koskela a...@iki.fi Date: Tue, 2 Dec 2014 13:56:15 +0200 Subject: [PATCH]

Re: [PATCH 1/3] tree.c: update read_tree_recursive callback to pass strbuf as base

2014-12-02 Thread Eric Sunshine
On Tue, Dec 2, 2014 at 7:11 AM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Dec 2, 2014 at 2:32 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: This allows the callback to use 'base' as a temporary buffer to quickly assemble full path without extra

Re: Deprecation warnings under XCode

2014-12-02 Thread Eric Sunshine
On Mon, Dec 1, 2014 at 1:04 PM, Junio C Hamano gits...@pobox.com wrote: Torsten Bögershausen tbo...@web.de writes: On 12/01/2014 04:02 AM, Michael Blume wrote: I have no idea whether this should concern anyone, but my mac build of git shows CC imap-send.o imap-send.c:183:36: warning:

Re: Deprecation warnings under XCode

2014-12-02 Thread Eric Sunshine
On Tue, Dec 2, 2014 at 8:12 PM, Michael Blume blume.m...@gmail.com wrote: On Tue, Dec 2, 2014 at 4:37 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Dec 1, 2014 at 1:04 PM, Junio C Hamano gits...@pobox.com wrote: I am not a Mac person, but is this about APPLE_COMMON_CRYPTO support

Re: Deprecation warnings under XCode

2014-12-03 Thread Eric Sunshine
On Wed, Dec 3, 2014 at 5:04 AM, David Aguilar dav...@gmail.com wrote: On Tue, Dec 02, 2014 at 10:09:35PM -0500, Eric Sunshine wrote: The potentially lesser evil would be this small patch (minus Gmail whitespace damage) which disables the deprecation warnings only for Apple's headers: - 8

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Eric Sunshine
On Tue, Dec 2, 2014 at 7:12 AM, Yi EungJun semtlen...@gmail.com wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= - LANGUAGE=ko:en -

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Eric Sunshine
On Wed, Dec 3, 2014 at 12:10 AM, Jonathan Nieder jrnie...@gmail.com wrote: When preparing an error message in a strbuf, it can be convenient to add a formatted string to the beginning: if (transaction_commit(t, err)) { strbuf_prefixf(err, cannot fetch '%s': ,

Re: [PATCH] git-svn: Support for git-svn propset

2014-12-07 Thread Eric Sunshine
On Sun, Dec 7, 2014 at 3:00 AM, Torsten Bögershausen tbo...@web.de wrote: On 2014-12-07 06.45, Torsten Bögershausen wrote: [] + +test_expect_success 'add multiple props' ' +git svn propset svn:keywords FreeBSD=%H foo +git svn propset fbsd:nokeywords yes foo +echo hello foo

Re: [PATCH] git-svn: propset support v2

2014-12-07 Thread Eric Sunshine
On Sat, Dec 6, 2014 at 5:29 PM, Alfred Perlstein alf...@freebsd.org wrote: I have incorporated Eric Wong's feedback into the git-svn propset support patch. There is a nit that I want to point out. The code does not support adding props unless there are also content changes to the files as

Re: [PATCH 4/7] parse_color: refactor color storage

2014-12-09 Thread Eric Sunshine
On Tue, Dec 9, 2014 at 3:14 PM, Johannes Sixt j...@kdbg.org wrote: Am 20.11.2014 um 16:17 schrieb Jeff King: +#define COLOR_FOREGROUND '3' +#define COLOR_BACKGROUND '4' This (COLOR_BACKGROUND) causes an ugly redefinition warning on Windows, because we inherit a definition from a Windows

Re: [PATCH/RFC 3/4] attr: do not attempt to expand when we know it's not a macro

2014-12-09 Thread Eric Sunshine
On Tue, Dec 9, 2014 at 8:53 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Keep track of all recognized macros in the new maybe_macro field. This this field is true, it _may_ be a macro (depending on what's in s/This this/If this/ the current attr stack). But if the field is false, it's

Re: [PATCH v3 10/23] untracked cache: save to an index extension

2014-12-09 Thread Eric Sunshine
On Mon, Dec 8, 2014 at 9:04 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index fe6f316..b97ac8d 100644 ---

Re: [PATCH v3] pkt-line: allow writing of LARGE_PACKET_MAX buffers

2014-12-10 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 2:34 AM, Jeff King p...@peff.net wrote: Below is a another iteration on the patch. The actual code changes are the same as the strbuf one, but the tests take care to avoid assuming the filesystem can handle such a long path. Testing on Windows and OS X is appreciated.

Re: [PATCH v3] pkt-line: allow writing of LARGE_PACKET_MAX buffers

2014-12-10 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 3:36 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Dec 10, 2014 at 2:34 AM, Jeff King p...@peff.net wrote: Below is a another iteration on the patch. The actual code changes are the same as the strbuf one, but the tests take care to avoid assuming

Re: [PATCH v3] pkt-line: allow writing of LARGE_PACKET_MAX buffers

2014-12-10 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 4:42 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Dec 10, 2014 at 3:36 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Dec 10, 2014 at 2:34 AM, Jeff King p...@peff.net wrote: Below is a another iteration on the patch. The actual code changes

Re: [PATCH v4] pkt-line: allow writing of LARGE_PACKET_MAX buffers

2014-12-10 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 4:47 AM, Jeff King p...@peff.net wrote: On Wed, Dec 10, 2014 at 03:36:31AM -0500, Eric Sunshine wrote: On Wed, Dec 10, 2014 at 2:34 AM, Jeff King p...@peff.net wrote: Below is a another iteration on the patch. The actual code changes are the same as the strbuf one

Re: [PATCH v4] pkt-line: allow writing of LARGE_PACKET_MAX buffers

2014-12-10 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 4:47 AM, Jeff King p...@peff.net wrote: Subject: pkt-line: allow writing of LARGE_PACKET_MAX buffers When we send out pkt-lines with refnames, we use a static 1000-byte buffer. This means that the maximum size of a ref over the git protocol is around 950 bytes (the

Re: [PATCH 1/2] commit: loosen ident checks when generating template

2014-12-11 Thread Eric Sunshine
On Wed, Dec 10, 2014 at 10:42 AM, Jeff King p...@peff.net wrote: Signed-off-by: Jeff King p...@peff.net --- diff --git a/builtin/commit.c b/builtin/commit.c index d1c90db..2be5506 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -822,8 +821,14 @@ static int prepare_to_commit(const

Re: [PATCH 1/3] create gpg homedir on the fly

2014-12-12 Thread Eric Sunshine
On Fri, Dec 12, 2014 at 3:50 AM, Christian Hesse m...@eworm.de wrote: GnuPG 2.1 homedir looks different, so just creat it on the fly by s/creat/create/ importing needed private and public keys and ownertrust. This solves an issue with gnupg 2.1 running interactive pinentry when old secret

Re: [PATCH 1/1] tests: make comment match the code

2014-12-16 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 3:40 AM, Christian Hesse m...@eworm.de wrote: GnuPG homedir is generated on the fly and keys are imported from armored key file. Make commet match available key info and new key s/commet/comment/ generation procedure. Signed-off-by: Christian Hesse m...@eworm.de --

Re: [PATCHv2 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-16 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 1:49 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time

Re: [PATCHv2 5/6] push.c: add an --atomic-push argument

2014-12-16 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 1:49 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com

Re: [PATCHv2 6/6] t5543-atomic-push.sh: add basic tests for atomic pushes

2014-12-16 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 1:49 PM, Stefan Beller sbel...@google.com wrote: This adds tests for the atomic push option. The first four tests check if the atomic option works in good conditions and the last three patches check if the atomic option prevents any change to be pushed if just one ref

Re: [PATCHv2 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-16 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 2:29 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Dec 16, 2014 at 1:49 PM, Stefan Beller sbel...@google.com wrote: --- diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index e76e5d5..0803fd2 100644 --- a/builtin/receive-pack.c +++ b/builtin

[PATCH] git-compat-util: suppress unavoidable Apple-specific deprecation warnings

2014-12-16 Thread Eric Sunshine
noise: they don't tell us anything useful and we have no control over them, nor is Apple likely to provide replacements any time soon. Such noise may obscure other legitimate warnings, therefore silence them. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Related discussion: http

Re: [PATCH] builtin/remote.c: add missing space to user-facing message

2014-12-17 Thread Eric Sunshine
On Wed, Dec 17, 2014 at 4:20 AM, Alex Henrie alexhenri...@gmail.com wrote: Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/remote.c b/builtin/remote.c index 7f28f92..c55c7ce 100644 ---

Re: [PATCH] git-compat-util: suppress unavoidable Apple-specific deprecation warnings

2014-12-18 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 6:19 PM, Eric Sunshine sunsh...@sunshineco.com wrote: With the release of Mac OS X 10.7 in July 2011, Apple deprecated all openssl.h functionality due to OpenSSL ABI (application binary interface) instability, resulting in an explosion of compilation warnings about

Re: [PATCHv4 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-18 Thread Eric Sunshine
On Thu, Dec 18, 2014 at 12:45 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a

Re: [PATCHv3 3/6] send-pack.c: add --atomic command line argument

2014-12-18 Thread Eric Sunshine
On Wed, Dec 17, 2014 at 1:32 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com This adds support to send-pack to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic. Signed-off-by:

Re: [PATCHv3 5/6] push.c: add an --atomic argument

2014-12-18 Thread Eric Sunshine
On Wed, Dec 17, 2014 at 1:32 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com

Re: [PATCHv5 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-19 Thread Eric Sunshine
On Thu, Dec 18, 2014 at 7:22 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time

Re: [PATCH 1/3] configure.ac: check tv_nsec field in struct stat

2014-12-21 Thread Eric Sunshine
On Sun, Dec 21, 2014 at 1:53 PM, Reuben Hawkins reuben...@gmail.com wrote: This check will automatically set the correct NO_NSEC setting. Missing sign-off. See git/Documentation/SubmittingPatches. --- diff --git a/configure.ac b/configure.ac index 6af9647..3cfdd51 100644 --- a/configure.ac

Re: [PATCH 2/3] configure.ac,trace.c: check for CLOCK_MONOTONIC

2014-12-21 Thread Eric Sunshine
On Sun, Dec 21, 2014 at 1:53 PM, Reuben Hawkins reuben...@gmail.com wrote: CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3 systems being used in production. This change makes compiling git less tedious on older platforms. Missing sign-off. --- diff --git a/configure.ac

Re: [PATCH 3/3] configure.ac,imap-send.c: check HMAC_CTX_cleanup

2014-12-21 Thread Eric Sunshine
On Sun, Dec 21, 2014 at 1:53 PM, Reuben Hawkins reuben...@gmail.com wrote: Older versions of OpenSSL have HMAC_cleanup, but not HMAC_CTX_cleanup. This change checks for both, uses HMAC_CTX_cleanup on platforms which have it, otherwise falls back to HMAC_cleanup. On this project, imperative

Re: [PATCH 1/3] configure.ac: check tv_nsec field in struct stat

2014-12-21 Thread Eric Sunshine
On Sun, Dec 21, 2014 at 3:20 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sun, Dec 21, 2014 at 1:53 PM, Reuben Hawkins reuben...@gmail.com wrote: +AC_CHECK_MEMBER([struct stat.st_mtim.tv_nsec], +[HAVE_ST_MTIM=Yes], +[HAVE_ST_MTIM=No], In Autoconf, it's customary to use lowercase

Re: [PATCH 1/7] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-22 Thread Eric Sunshine
On Fri, Dec 19, 2014 at 2:38 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com This adds support to the protocol between send-pack and receive-pack to * allow receive-pack to inform the client that it has atomic push capability * allow send-pack to request

Re: [PATCH 3/7] send-pack.c: add --atomic command line argument

2014-12-22 Thread Eric Sunshine
On Fri, Dec 19, 2014 at 2:38 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com This adds support to send-pack to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic. Signed-off-by:

Re: [PATCH 4/7] receive-pack.c: receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-22 Thread Eric Sunshine
. Inspired-by: Ronnie Sahlberg sahlb...@google.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index e76e5d5..710cd7f 100644 --- a/builtin/receive-pack.c +++ b/builtin

Re: mangled file names in git checkout-index --temp output when run in repo subdirectory

2014-12-23 Thread Eric Sunshine
On Tue, Dec 23, 2014 at 11:36 AM, Russ Cox r...@golang.org wrote: I am using git checkout-index --temp to obtain copies of files from the index, but it does not always print valid file names unless run from the repository root. git checkout-index --temp prints names of files in the index

[PATCH 1/5] t2004: modernize style

2014-12-24 Thread Eric Sunshine
In particular: * indent test body * place test description on same line as test_expect_* * place closing quote on its own line * name output file actual rather than out * name setup test setup rather than preparation Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t2004-checkout

[PATCH 0/5] resolve checkout-index --temp path mangling

2014-12-24 Thread Eric Sunshine
This patch series fixes a path mangling bug in checkout-index --temp reported by Russ Cox[1]. As a bonus, it also squashes a bug in which checkout-index was accessing and printing memory beyond end-of-string. [1]: http://thread.gmane.org/gmane.comp.version-control.git/261739 Eric Sunshine (5

[PATCH 4/5] t2004: demonstrate broken relative path printing

2014-12-24 Thread Eric Sunshine
longer than the directory name in which checkout-index is invoked. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t2004-checkout-cache-temp.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh index 602fbc7

[PATCH 5/5] checkout-index: fix --temp relative path mangling

2014-12-24 Thread Eric Sunshine
in file\0rectory/../file. When checkout-index skipped strlen(subdirectory/) bytes, it ended up back at ../file and thus appeared to give the correct answer, despite being past end-of-string. Reported-by: Russ Cox r...@golang.org Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- builtin

[PATCH 3/5] t2004: standardize file naming in symlink test

2014-12-24 Thread Eric Sunshine
Update symlink test to use the common file naming scheme so that its temporary files can be cleaned up by the rm -f path* idiom employed by other tests in this script. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t2004-checkout-cache-temp.sh | 6 +++--- 1 file changed, 3 insertions

[PATCH 2/5] t2004: drop unnecessary write-tree/read-tree

2014-12-24 Thread Eric Sunshine
Unlike earlier tests which reference several trees prepared by setup, no other tests utilize the tree from the symlink test, so there is no need to write it (or read it back immediately). Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t2004-checkout-cache-temp.sh | 3 --- 1 file

Re: [PATCH v6 1/1] http: Add Accept-Language header if possible

2014-12-24 Thread Eric Sunshine
On Mon, Dec 22, 2014 at 11:44 AM, Yi EungJun semtlen...@gmail.com wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= - LANGUAGE=ko:en -

Re: [PATCH v2 2/3] attr: do not attempt to expand when we know it's not a macro

2014-12-27 Thread Eric Sunshine
, no need to go through the whole attr stack in macroexpand_one() to search for one. Without this, git grep abcdefghi on git.git hits the inner loop in macroexpand_one() 2481 times. With this, it's 66 times. Helped-by: Eric Sunshine sunsh...@sunshineco.com My only contribution was pointing out

Re: [PATCH 1/2] t4255: test am submodule with diff.submodule

2014-12-27 Thread Eric Sunshine
On Fri, Dec 26, 2014 at 6:11 PM, Doug Kelly dougk@gmail.com wrote: git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently two ways this can fail: * With errors (unrecognized input), if only change *

Re: [PATCH v2 1/2] t4255: test am submodule with diff.submodule

2014-12-27 Thread Eric Sunshine
On Sat, Dec 27, 2014 at 07:04:23PM -0600, Doug Kelly wrote: git am will break when using diff.submodule=log; add some test cases to illustrate this breakage as simply as possible. There are currently two ways this can fail: * With errors (unrecognized input), if only change * Silently (no

Re: [PATCH 5/5] checkout-index: fix --temp relative path mangling

2014-12-27 Thread Eric Sunshine
On Wed, Dec 24, 2014 at 4:43 AM, Eric Sunshine sunsh...@sunshineco.com wrote: checkout-index --temp only properly prints relative paths which are descendants of the current directory. Paths in ancestor or sibling directories (or their children) are often printed in mangled form. For example

Re: [PATCH v2] send-email: Much readable error output

2014-12-28 Thread Eric Sunshine
On Sat, Dec 27, 2014 at 6:09 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com This patch has two distinct goals. First, it's adding \n to 'die' messages to suppress the file+line# information which Perl appends automatically to 'die'

Re: [PATCHv2] Documentation/SubmittingPatches: Explain the rationale of git notes

2014-12-29 Thread Eric Sunshine
On Mon, Dec 29, 2014 at 12:42 PM, Stefan Beller sbel...@google.com wrote: This adds more explanation of why you want to have the --notes option given to git format-patch. Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/Documentation/SubmittingPatches

Re: [PATCHv8 4/9] receive-pack.c: simplify execute_commands

2014-12-29 Thread Eric Sunshine
be conveying to the reader. The claimed simplification is questionable and not of particular importance; and it's misleading to paint it as a goal of the patch. Consequently, you could drop mention of it altogether. More below. Suggested-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefan

Re: [PATCHv8 1/9] receive-pack.c: add documentation for atomic push support

2014-12-29 Thread Eric Sunshine
On Mon, Dec 29, 2014 at 9:36 PM, Stefan Beller sbel...@google.com wrote: Subject: receive-pack.c: add documentation for atomic push support This patch is doing a lot more than merely adding documentation. It's also updating send-pack and receive-pack to be able to negotiate the new protocol

Re: [PATCHv8 4/9] receive-pack.c: simplify execute_commands

2014-12-29 Thread Eric Sunshine
On Mon, Dec 29, 2014 at 9:36 PM, Stefan Beller sbel...@google.com wrote: No functional changes intended. This commit shortens execute_commands by moving some parts of the code to extra functions. Suggested-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefan Beller sbel

Re: [PATCHv8 5/9] receive-pack.c: move transaction handling in a central place

2014-12-30 Thread Eric Sunshine
-level role, execute_commands() does not need to know or care about the low-level details of each mode of operation. Therefore, as preparation for introducing a new mode, you're factoring out the existing mode into its own stand-alone function. Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed

Re: [PATCHv8 6/9] receive-pack.c: add execute_commands_atomic function

2014-12-30 Thread Eric Sunshine
...@google.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Stefan Beller sbel...@google.com --- diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 5f44466..35a2264 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1076,8 +1076,8 @@ static void

Re: [PATCHv8 4/9] receive-pack.c: simplify execute_commands

2014-12-30 Thread Eric Sunshine
On Tue, Dec 30, 2014 at 3:42 AM, Stefan Beller sbel...@google.com wrote: On Mon, Dec 29, 2014 at 11:46 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Dec 29, 2014 at 9:36 PM, Stefan Beller sbel...@google.com wrote: No functional changes intended. +static void check_shallow_bugs

Re: [PATCHv8 1/9] receive-pack.c: add documentation for atomic push support

2014-12-30 Thread Eric Sunshine
On Tue, Dec 30, 2014 at 3:33 AM, Stefan Beller sbel...@google.com wrote: On Mon, Dec 29, 2014 at 11:08 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Dec 29, 2014 at 9:36 PM, Stefan Beller sbel...@google.com wrote: Subject: receive-pack.c: add documentation for atomic push support

Re: [PATCHv8 5/9] receive-pack.c: move transaction handling in a central place

2014-12-30 Thread Eric Sunshine
On Tue, Dec 30, 2014 at 1:45 PM, Stefan Beller sbel...@google.com wrote: On Tue, Dec 30, 2014 at 12:36 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Dec 29, 2014 at 9:36 PM, Stefan Beller sbel...@google.com wrote: No functional changes intended. Secondary information can

Re: Bug report: checkout-index --temp path is not always relative to the current directory

2014-12-30 Thread Eric Sunshine
On Tue, Dec 30, 2014 at 5:21 PM, Josh Bleecher Snyder joshar...@gmail.com wrote: In the section on using --temp, 'git help checkout-index' says: The path field is always relative to the current directory and the temporary file names are always relative to the top level directory. However,

Re: [PATCH] Documentation/SubmittingPatches: Explain the rationale of git notes

2014-12-30 Thread Eric Sunshine
On Mon, Dec 29, 2014 at 06:48:48PM -0800, Stefan Beller wrote: On Mon, Dec 29, 2014 at 6:47 PM, Stefan Beller sbel...@google.com wrote: From: Eric Sunshine sunsh...@sunshineco.com As I just copied the whole text of Eric, I think it would be better if Eric is credited for this commit

Re: [PATCH] for-each-ref: Always check stat_tracking_info()'s return value.

2015-01-02 Thread Eric Sunshine
On Fri, Jan 2, 2015 at 10:44 AM, Raphael Kubo da Costa raphael.kubo.da.co...@intel.com wrote: The code handling %(upstream:track) and %(upstream:trackshort) assumed it always had a valid branch that had been sanitized earlier in populate_value(), and thus did not check the return value of the

<    4   5   6   7   8   9   10   11   12   13   >