Re: [PATCH] builtin/apply.c: use iswspace() to detect line-ending-like chars

2014-03-23 Thread Eric Sunshine
On Sat, Mar 22, 2014 at 5:33 AM, George Papanikolaou g3orge@gmail.com wrote: On Sat, Mar 22, 2014 at 12:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Because it's unnecessary and invites confusion from people reading the code since they now have to wonder if there is something

Re: [PATCH] Modify fsck_commit. Replace memcmp by skip_prefix

2014-03-23 Thread Eric Sunshine
On Sun, Mar 23, 2014 at 9:10 AM, Ashwin Jha ajha@gmail.com wrote: On 03/23/2014 02:10 PM, Eric Sunshine wrote: On Sat, Mar 22, 2014 at 11:12 AM, Ashwin Jha ajha@gmail.com wrote: - if (memcmp(buffer, tree , 5)) + buffer = (char *)skip_prefix(buffer, tree ); These casts

Re: [PATCH] Clarify pre-push hook documentation

2014-03-23 Thread Eric Sunshine
On Sun, Mar 23, 2014 at 3:01 PM, David Cowden dco...@gmail.com wrote: The documentation as-is does not mention that the pre-push hook is executed even when there is nothing to push. This can lead a new reader to beilieve there will always be lines fed to the script's standerd input and cause

Re: [PATCH] Allow --pretty to be passed to git-describe.

2014-03-24 Thread Eric Sunshine
On Mon, Mar 24, 2014 at 9:04 PM, Cyril Roelandt tipec...@gmail.com wrote: In some cases, ony may want to find the the most recent tag that is reachable s/ony/one/ from a commit and have it pretty printed, using the formatting options available in git-log and git-show. Signed-off-by: Cyril

Re: [PATCH 1/3] test-lib: Document short options in t/README

2014-03-24 Thread Eric Sunshine
On Mon, Mar 24, 2014 at 4:49 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Most arguments that could be provided to a test have short forms. Unless documented the only way to learn then is to read the code. s/then/them/ (Also, add a comma after documented.) Signed-off-by: Ilya Bobyr

Re: [PATCH v3 1/2] fsck.c: modify fsck_ident() and fsck_commit()

2014-03-25 Thread Eric Sunshine
On Mon, Mar 24, 2014 at 8:08 AM, Ashwin Jha ajha@gmail.com wrote: Subject: fsck.c: modify fsck_ident() and fsck_commit() The subject should summarize the change while being concise and expressive. The above is a bit lacking. A better subject might be: Subject: fsck: add missing 'const's

Re: [PATCH v3 2/2] fsck.c:fsck_commit replace memcmp by skip_prefix

2014-03-25 Thread Eric Sunshine
On Mon, Mar 24, 2014 at 8:09 AM, Ashwin Jha ajha@gmail.com wrote: Replace memcmp by skip_prefix as it serves the dual purpose of checking the string for a prefix as well as skipping that prefix. Signed-off-by: Ashwin Jha ajha@gmail.com --- fsck_commit(): After the first patch in

Re: [PATCH v2 000/142] Use the $( ... ) construct for command substitution instead of using the back-quotes

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 3:02 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Junio C Hamano gits...@pobox.com writes: - Nobody has time or energy to go through 140+ patches in one go, with enough concentration necessary to do so without making mistakes (this applies to yourself,

Re: [PATCH v2 06/17] ls-files: add --color to highlight file names

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 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 --- Documentation/git-ls-files.txt | 9 + builtin/ls-files.c | 38 +++--- 2 files changed, 44

Re: [PATCH v2 03/17] ls_colors.c: add function to color a file name

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Tthe new function is based on print_color_indicator() from commit s/Tthe/The/ 7326d1f1a67edf21947ae98194f98c38b6e9e527 in coreutils.git. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- color.h |

Re: [PATCH v2 05/17] ls-files: buffer full item in strbuf before printing

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Buffering so that we can manipulate the strings (e.g. coloring) further before finally printing them. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/ls-files.c | 48

Re: [PATCH v2 07/17] ls-files: add --column

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 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 --- Documentation/git-ls-files.txt | 6 ++ builtin/ls-files.c | 25 + 2 files changed, 31 insertions(+) diff --git

Re: [PATCH v2 08/17] ls-files: support --max-depth

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 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 --- Documentation/git-ls-files.txt | 7 +++ builtin/ls-files.c | 7 +++ 2 files changed, 14 insertions(+) diff --git

Re: [PATCH v2 10/17] Add git-ls, a user friendly version of ls-files and more

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, 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 v2 05/17] ls-files: buffer full item in strbuf before printing

2014-03-26 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 7:18 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Mar 27, 2014 at 2:22 AM, Eric Sunshine sunsh...@sunshineco.com wrote: static void show_dir_entry(const char *tag, struct dir_entry *ent) { + static struct strbuf sb = STRBUF_INIT; int len

Re: [PATCH] gitweb: gpg signature status indication for commits

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 10:56 AM, Victor Kartashov victor.kartas...@gmail.com wrote: shows gpg signature (if any) for commit message in gitweb in case of successfully verifying the signature highlights it with green Write in imperative mood: Show gpg ... highlight it... As a corollary, would

Re: [PATCH 3/3] patch-id-test: test new --stable and --unstable flags

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 5:25 AM, Michael S. Tsirkin m...@redhat.com wrote: Verify that patch ID is now stable against hunk reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 68 + 1 file changed, 63

Re: [PATCH 10/10] Documentation: Document --function-name usage

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 2:50 PM, David A. Dalrymple (and Bhushan G. Lodha) dad-...@mit.edu wrote: From: Bhushan Lodha David A. Dalrymple dad-...@mit.edu Signed-off-by: David Dalrymple (on zayin) davi...@alum.mit.edu --- Documentation/diff-options.txt | 9 +

Re: [PATCH v2 06/17] ls-files: add --color to highlight file names

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 7:15 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Mar 27, 2014 at 2:13 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, Mar 26, 2014 at 9:48 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

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 6:32 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Allow better control of the set of tests that will be executed for a single test suite. Mostly useful while debugging or developing as it allows to focus on a specific test. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com

Re: [RFC] submodule: change submodule.name.branch default from master to HEAD

2014-03-27 Thread Eric Sunshine
On Thu, Mar 27, 2014 at 11:36 PM, W. Trevor King wk...@tremily.us wrote: gitmodule(5) mentioned 'master' as the default remote branch, but folks using checkout-style updates are unlikely to care which upstream branch their commit comes from (they only care that the clone fetches that commit).

Re: [PATCH v2 13/17] ls: add -1 short for --no-column in the spirit of GNU ls

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Subject: ls: add -1 short for --no-column in the spirit of GNU ls The -1 option is POSIX [1]; not a GNU extension. [1]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ls.html Signed-off-by: Nguyễn Thái

Re: [PATCH v2 16/17] ls: do not show duplicate cached entries

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 9:48 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: With the current show_files() ls -tcm will show foo.c M foo.c The first item is redundant. If foo.c is modified, we know it's in the cache. Introduce show_files_compact to do that because ls-files is plumbing

Re: [PATCH 6/6] pack-objects: reuse deltas for thin have objects

2014-03-27 Thread Eric Sunshine
On Wed, Mar 26, 2014 at 3:23 AM, Jeff King p...@peff.net wrote: When we calculate the wants and haves for a pack, we only add the objects in the boundary commits as preferred bases. However, we know that every object reachable from the haves could be a preferred base. We probably don't want

Re: [PATCH 09/10] t4213: test --function-name option

2014-03-28 Thread Eric Sunshine
On Fri, Mar 28, 2014 at 3:25 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha): From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu This test builds a sample C file, adding and removing functions, and checks that the

Re: Problems with git 1.8.5.3 on HP-UX 11.11

2014-03-28 Thread Eric Sunshine
On Fri, Mar 28, 2014 at 3:01 PM, Jeff King p...@peff.net wrote: On Fri, Mar 28, 2014 at 11:09:14AM -, Gerhard Grimm wrote: git submodule init fails with the output Assertion failed: err == REG_ESPACE, file compat/regex/regexec.c, line 1096 No submodule mapping found in

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-03-30 Thread Eric Sunshine
On Fri, Mar 28, 2014 at 3:05 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: On 3/27/2014 8:36 PM, Eric Sunshine wrote: On Thu, Mar 27, 2014 at 6:32 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Allow better control of the set of tests that will be executed for a single test suite. Mostly useful

Re: [PATCH 21/22] lockfile: extract a function reset_lock_file()

2014-04-02 Thread Eric Sunshine
On Tue, Apr 1, 2014 at 11:58 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- lockfile.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/lockfile.c b/lockfile.c index

Re: [PATCH 22/22] lockfile: allow new file contents to be written while retaining lock

2014-04-02 Thread Eric Sunshine
On Tue, Apr 1, 2014 at 11:58 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Add a new option flag, LOCK_SEPARATE_STAGING_FILE, that can be passed to hold_lock_file_for_update() or hold_lock_file_for_append() to use a staging file that is independent of the lock file. Add a new function

Re: [PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

2014-04-03 Thread Eric Sunshine
On Thu, Apr 3, 2014 at 2:14 PM, Michael S. Tsirkin m...@redhat.com wrote: Allow extracting To/Cc addresses from cover letter. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16 2

Re: [PATCH] describe: rewrite name_rev() iteratively

2014-04-08 Thread Eric Sunshine
[cc: Sylvestre Ledru sylves...@mozilla.com] On Sun, Apr 6, 2014 at 6:47 PM, Dragos Foianu dragos.foi...@gmail.com wrote: The git describe --contains command uses the name_rev() function which is currently a recursive function. This causes a Stack Overflow when the history is large enough. No

Re: [PATCH 1/6] run_external_diff: use an argv_array for the command line

2014-04-19 Thread Eric Sunshine
On Sat, Apr 19, 2014 at 3:17 PM, Jeff King p...@peff.net wrote: We currently generate the command-line for the external command using a fixed-length array of size 10. But if there is a rename, we actually need 11 elements (10 items, plus a NULL), and end up writing a random NULL onto the

Re: [PATCH v2 1/2] bugfix: fix broken time_buf paddings for git-blame

2014-04-20 Thread Eric Sunshine
On Sun, Apr 20, 2014 at 12:13 PM, Jiang Xin worldhello@gmail.com wrote: When `git blame` shows date field in a fixed width (as long as s/fixed width/fixed-width/ s/long/wide/ would read a bit better. blame_date_width characters), if time_str shorter than that, add spaces s/shorter/is

Re: [RTC/PATCH] Add 'update-branch' hook

2014-04-21 Thread Eric Sunshine
On Sun, Apr 20, 2014 at 10:23 PM, Felipe Contreras felipe.contre...@gmail.com wrote: This hook is invoked whenever a branch is updated, either when a branch is created or updated with 'git branch', or when it's rebased with 'git rebase'. It receives two parameters; the name of the branch, and

Re: [PATCH 3/3] test-lib: '--run' to run only specific tests

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 4:19 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: Allow better control of the set of tests that will be executed for a single test suite. Mostly useful while debugging or developing as it allows to focus on a specific test. Signed-off-by: Ilya Bobyr ilya.bo...@gmail.com

Re: [PATCH 1/3] fetch.c: clear errno before calling functions that might set it

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: In s_update_ref there are two calls that when they fail we return an error based on the errno value. In particular we want to return a specific error if ENOTDIR happened. Both these functions do have failure modes where

Re: [PATCH 2/3] fetch.c: change s_update_ref to use a ref transaction

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: Change s_update_ref to use a ref transaction for the ref update. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com Doubled sign-off. --- builtin/fetch.c | 15

Re: [PATCH 3/3] fetch.c: use a single ref transaction for all ref updates

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 2:45 PM, Ronnie Sahlberg sahlb...@google.com wrote: Change store_updated_refs to use a single ref transaction for all refs that are updated during the fetch. This makes the fetch more atomic when update failures occur. Since ref update failures will now no longer occur

Re: [PATCH v5 1/2] add: add --ignore-submodules[=when] parameter

2014-04-23 Thread Eric Sunshine
On Tue, Apr 22, 2014 at 5:12 PM, Ronald Weiss weiss.ron...@gmail.com wrote: Allow ignoring submodules (or not) by command line switch, like diff and status do. This commit is also a prerequisite for the next one in series, which adds the --ignore-submodules switch to git commit. That's why a

Re: [PATCH v7 05/12] cherry-pick: remember rerere-autoupdate

2014-04-24 Thread Eric Sunshine
On Wed, Apr 23, 2014 at 10:44 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh index e6a6481..274b2cc 100755 --- a/t/t3504-cherry-pick-rerere.sh +++

Re: [PATCH v4 12/27] replace.c: use the ref transaction functions for updates

2014-04-28 Thread Eric Sunshine
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote: Update replace.c to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/replace.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git

Re: [PATCH v4 08/27] refs.c: change ref_transaction_update() to do error checking and return status

2014-04-28 Thread Eric Sunshine
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote: Update ref_transaction_update() do some basic error checking and return true on error. Update all callers to check ref_transaction_update() for error. Signed-off-by: Ronnie Sahlberg sahlb...@google.com ---

Re: [PATCH v4 15/27] fast-import.c: change update_branch to use ref transactions

2014-04-28 Thread Eric Sunshine
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote: Change update_branch() to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- fast-import.c | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff

Re: [PATCH v4 12/27] replace.c: use the ref transaction functions for updates

2014-04-29 Thread Eric Sunshine
On Tue, Apr 29, 2014 at 12:18 PM, Ronnie Sahlberg sahlb...@google.com wrote: On Mon, Apr 28, 2014 at 5:44 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote: Update replace.c to use ref transactions for updates. Signed

Re: [PATCH 18/32] read-cache: mark new entries for split index

2014-04-30 Thread Eric Sunshine
On Mon, Apr 28, 2014 at 6:55 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Make sure entry addition does not lead to unifying the index. We don't need to explicitly keep track of new entries. If ce-index is zero, they're new. Otherwise it's unlikely that they are new, but we'll do a

Re: [PATCH v6 20/42] fetch.c: clear errno before calling functions that might set it

2014-05-01 Thread Eric Sunshine
On Thu, May 1, 2014 at 4:37 PM, Ronnie Sahlberg sahlb...@google.com wrote: In s_update_ref there are two calls that when they fail we return an error based on the errno value. In particular we want to return a specific error if ENOTDIR happened. Both these functions do have failure modes where

Re: [PATCH v6 40/42] refs.c: pass a skip list to name_conflict_fn

2014-05-01 Thread Eric Sunshine
On Thu, May 1, 2014 at 4:37 PM, Ronnie Sahlberg sahlb...@google.com wrote: Allow passing a list of refs to ckip checking to name_conflict_fn. s/ckip/skip/ There are some conditions where we want to allow a temporary conflict and skip checking those refs. For example if we have a transaction

Re: [PATCH 1/4] remote-hg: add more tests

2014-05-04 Thread Eric Sunshine
On Sat, May 3, 2014 at 10:16 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Inspired by the tests in gitifyhg. One test is failing, but that's because of a limitation of remote-helpers. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: Please pull the patch series use the $( ... ) construct for command substitution

2014-05-14 Thread Eric Sunshine
On Wed, May 14, 2014 at 1:14 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Elia Pinto gitter.spi...@gmail.com writes: The following changes since commit 6308767f0bb58116cb405e1f4f77f5dfc1589920: Merge branch 'fc/prompt-zsh-read-from-file' (2014-05-13 11:53:14 -0700) are available in

Re: [PATCH 09/31] refs.c: allow multiple reflog updates during a single transaction

2014-05-16 Thread Eric Sunshine
On Fri, May 16, 2014 at 5:35 PM, Junio C Hamano gits...@pobox.com wrote: Ronnie Sahlberg sahlb...@google.com writes: Allow to make multiple reflog updates to the same ref during a transaction. This means we only need to lock the reflog once, during the first update that touches the reflog,

Re: [GIT GUI PATCH v2] git-gui: tolerate major version changes when comparing the git version

2014-05-17 Thread Eric Sunshine
On Sat, May 17, 2014 at 3:49 PM, Jens Lehmann jens.lehm...@web.de wrote: Since git 2.0.0 starting git gui in a submodule using a gitfile fails with the following error: No working directory ../../../path couldn't change working directory to ../../../path: no such file or

Re: [PATCH 2/4] git-rebase: document ack

2014-05-18 Thread Eric Sunshine
On Sun, May 18, 2014 at 5:17 PM, Michael S. Tsirkin m...@redhat.com wrote: document ack! behaviour and use Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-rebase.txt | 45 +++- 1 file changed, 40 insertions(+), 5 deletions(-)

Re: [PATCH] rebase -i: test Nothing to do case with autostash

2014-05-20 Thread Eric Sunshine
On Tue, May 20, 2014 at 2:55 AM, Matthieu Moy matthieu@imag.fr wrote: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Ram's patch lacks a test. Here it is. Fails without Ram's patch, and passes with it. Can be squashed into Ram's patch. t/t3420-rebase-autostash.sh | 17

Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

2014-08-07 Thread Eric Sunshine
On Wed, Aug 6, 2014 at 7:59 PM, Fabian Ruch baf...@gmail.com wrote: The to-do list commands `squash` and `fixup` apply the changes introduced by the named commit to the tree but instead of creating a new commit on top of the current head it replaces the previous commit with a new commit that

Re: [PATCH v3 5/6] diff --stat: mark any file larger than core.bigfilethreshold binary

2014-08-13 Thread Eric Sunshine
On Wed, Aug 13, 2014 at 6:57 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Too large files may lead to failure to allocate memory. If it happens here, it could impact quite a few commands that involve diff. Moreover, too large files are inefficient to compare anyway (and most likely

Re: Git on Mac OS X 10.4.10

2014-08-15 Thread Eric Sunshine
On Fri, Aug 15, 2014 at 3:46 AM, Kyle J. McKay mack...@gmail.com wrote: On Aug 14, 2014, at 16:18, Junio C Hamano wrote: Markus Hitter m...@jump-ing.de writes: The CommonCrypto/CommonHMAC.h is in Mac OS X 10.6 .. 10.9, but not in 10.4 (I don't know about 10.5). That header is new with

Re: [PATCH v2 19/19] signed push: fortify against replay attacks

2014-08-23 Thread Eric Sunshine
On Fri, Aug 22, 2014 at 4:30 PM, Junio C Hamano gits...@pobox.com wrote: In order to prevent a valid push certificate for pushing into an repository from getting replayed to push to an unrelated one, send a nonce string from the receive-pack process and have the signer include it in the push

Re: [PATCH 3/3] log-tree: use FLEX_ARRAY in name_decoration

2014-08-26 Thread Eric Sunshine
On Tue, Aug 26, 2014 at 6:24 AM, Jeff King p...@peff.net wrote: We are already using the flex-array technique; let's annotate it with our usual FLEX_ARRAY macro. Besides being more readable, this is slightly more efficient on compilers that understand flex-arrays. Note that we need to bump

Re: [PATCH 1/2] read_index_from(): catch out of order entries when reading an index file

2014-08-28 Thread Eric Sunshine
On Wed, Aug 27, 2014 at 3:48 PM, Jaime Soriano Pastor jsorianopas...@gmail.com wrote: Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com --- read-cache.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/read-cache.c b/read-cache.c index 7f5645e..1cdb762

Re: [PATCH] setup.c: set workdir when gitdir is not default

2014-09-04 Thread Eric Sunshine
On Wed, Sep 3, 2014 at 6:42 PM, Max Kirillov m...@max630.net wrote: When gitfile is used, git sets GIT_DIR environment variable for subsequent commands, and that commands start working in mode GIT_DIR set, workdir current, which is incorrect for the case when git runs from subdirectory of

Re: [PATCH] git-notes.txt: Explain how to transfer notes between repos

2014-09-10 Thread Eric Sunshine
On Wed, Sep 10, 2014 at 9:56 AM, Øyvind A. Holm su...@sunbase.org wrote: The documentation for git notes did not mention anywhere how to transfer notes between repositories, create a section that explains this topic. Signed-off-by: Øyvind A. Holm su...@sunbase.org --- diff --git

Re: [PATCH v2 3/6] Make sure fsck_commit_buffer() does not run out of the buffer

2014-09-10 Thread Eric Sunshine
On Wed, Sep 10, 2014 at 9:52 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: So far, we assumed that the buffer is NUL terminated, but this is not a safe assumption, now that we opened the fsck_object() API to pass a buffer directly. So let's make sure that there is at least an

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-11 Thread Eric Sunshine
On Thu, Sep 11, 2014 at 11:36 AM, Marc Branchaud marcn...@xiplink.com wrote: On 14-09-10 06:41 PM, Nguyễn Thái Ngọc Duy wrote: (alias R=$GIT_COMMON_DIR/worktrees/id) - linked checkouts are supposed to keep its location in $R/gitdir up to date. The use case is auto fixup after a manual

Re: [PATCH 1/2] describe: support the syntax --abbrev=+

2014-09-14 Thread Eric Sunshine
On Sun, Sep 14, 2014 at 4:18 AM, Jeff King p...@peff.net wrote: On Fri, Sep 12, 2014 at 11:26:43AM -0300, Jonh Wendell wrote: It will print just a + sign appended to the found tag, if there are commits between the tag and the supplied commit. It's useful when you just need a simple output to

Re: [PATCH/RFC 1/2] submodule: add ability to shallowly clone any branch in a repo as a submodule

2014-09-14 Thread Eric Sunshine
On Sun, Sep 14, 2014 at 6:38 AM, Cole Minnaar cole.minn...@gmail.com wrote: Currently when specifying the `--depth` option to the 'submodule add' command, it can only create a shallow submodule clone of the currently active branch from the cloned repository. If a branch is specified using the

Re: [PATCH v5 00/23] Signed push

2014-09-16 Thread Eric Sunshine
On Tuesday, September 16, 2014, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: A failing test has been added at the end for smart HTTP. It appears that somewhere in the callchain --signed is forgotten and the sending end not to send the certificate for

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-20 Thread Eric Sunshine
On Sat, Sep 20, 2014 at 10:54 PM, Duy Nguyen pclo...@gmail.com wrote: On Fri, Sep 12, 2014 at 10:06 AM, Eric Sunshine sunsh...@sunshineco.com wrote: One minor addition for clarification would be to mention that the 'git prune --worktrees' invocation applies to the main worktree: When

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

2014-09-20 Thread Eric Sunshine
On Sat, Sep 20, 2014 at 10:41 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Sep 11, 2014 at 11:02:36AM -0400, Marc Branchaud wrote: Um, didn't you say in [1] that you'd use the text I posted in [2]? [1] http://article.gmane.org/gmane.comp.version-control.git/256446 [2]

[PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-21 Thread Eric Sunshine
), cp, strlen(SAMPLE) ... ~~~^ Resolve this issue. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- This is atop 2da1f366 (mailinfo: make From in-body header check more robust; 2014-09-13) in 'next'. In addition to the above diagnostic

Re: [PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-22 Thread Eric Sunshine
On Mon, Sep 22, 2014 at 1:41 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: The just-released Apple Xcode 6.0.1 has -Wstring-plus-int enabled by default which complains about pointer arithmetic applied to a string literal: builtin/mailinfo.c

Re: [PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-22 Thread Eric Sunshine
On Mon, Sep 22, 2014 at 4:50 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: however, the solution in this patch allows us drop a couple strlen()s in favor of sizeof()s. It is actually not a very good justification when you know you care about

Re: [PATCH v2 23/32] prune: strategies for linked checkouts

2014-09-22 Thread Eric Sunshine
the checkout. If $R/link exists and its link count is greated than 1, the repo is kept. Helped-by: Marc Branchaud marcn...@xiplink.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/git-checkout.txt | 20

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

2014-09-22 Thread Eric Sunshine
On Mon, Sep 22, 2014 at 5:00 PM, Marc Branchaud marcn...@xiplink.com wrote: On 14-09-21 05:50 AM, Duy Nguyen wrote: On Sun, Sep 21, 2014 at 10:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Would it make sense for this rule of thumb summary to be presented first

Re: [PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-23 Thread Eric Sunshine
On Tue, Sep 23, 2014 at 2:04 AM, Jeff King p...@peff.net wrote: On Mon, Sep 22, 2014 at 05:10:08PM -0400, Eric Sunshine wrote: On Mon, Sep 22, 2014 at 1:41 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: The just-released Apple Xcode 6.0.1 has

Re: [PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-23 Thread Eric Sunshine
On Tue, Sep 23, 2014 at 2:26 AM, Junio C Hamano gits...@pobox.com wrote: On Mon, Sep 22, 2014 at 11:04 PM, Jeff King p...@peff.net wrote: I don't mind silencing this one warning (even though I find it a little ridiculous). I'm slightly concerned that more brain-damage may be coming our way,

Re: [PATCH] mailinfo: resolve -Wstring-plus-int warning

2014-09-23 Thread Eric Sunshine
On Tue, Sep 23, 2014 at 3:51 AM, Jeff King p...@peff.net wrote: On Mon, Sep 22, 2014 at 11:26:14PM -0700, Junio C Hamano wrote: On Mon, Sep 22, 2014 at 11:04 PM, Jeff King p...@peff.net wrote: I don't mind silencing this one warning (even though I find it a little ridiculous). I'm

Re: [PATCH] de.po: Fixup one translation

2014-09-23 Thread Eric Sunshine
On Tue, Sep 23, 2014 at 3:37 AM, Stefan Beller stefanbel...@gmail.com wrote: English grammar with German words doesn't make it a German translation. ;) We also need to fix the Sentence fragment. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- po/de.po | 8 1 file changed,

Re: [PATCH 1/2] sha1-array: add test-sha1-array and basic tests

2014-10-01 Thread Eric Sunshine
On Wed, Oct 1, 2014 at 5:40 AM, René Scharfe l@web.de wrote: Signed-off-by: Rene Scharfe l@web.de --- diff --git a/t/t0064-sha1-array.sh b/t/t0064-sha1-array.sh new file mode 100755 index 000..bd68789 --- /dev/null +++ b/t/t0064-sha1-array.sh @@ -0,0 +1,64 @@ +#!/bin/sh +

Re: [PATCH 2/2] sha1-lookup: fix handling of duplicates in sha1_pos()

2014-10-01 Thread Eric Sunshine
On Wed, Oct 1, 2014 at 5:43 AM, René Scharfe l@web.de wrote: If the first 18 bytes of the SHA1's of all entries are the same then sha1_pos() dies and reports that the lower and upper limits of the binary search were the same that this wasn't supposed to happen. This is wrong because the

Re: [PATCH 2/3] Makefile: Reorder linker flags in the git executable rule

2014-10-26 Thread Eric Sunshine
On Sun, Oct 26, 2014 at 1:33 PM, David Michael fedora@gmail.com wrote: The XL C compiler can fail due to mixing library path and object Can you explain in the commit message the actual nature of the failure so that readers can understand more precisely how this change helps? file

Re: [PATCH 18/19] update-index: test the system before enabling untracked cache

2014-10-28 Thread Eric Sunshine
On Mon, Oct 27, 2014 at 8:10 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/builtin/update-index.c b/builtin/update-index.c index e57e2d7..471c0b4 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@

Re: [PATCH 06/19] untracked cache: record/validate dir mtime and reuse cached output

2014-10-30 Thread Eric Sunshine
On Mon, Oct 27, 2014 at 8:10 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/dir.c b/dir.c index 2793e57..55780a7 100644 --- a/dir.c +++ b/dir.c @@ -37,7 +37,12 @@ enum path_treatment { +static enum path_treatment treat_path_fast(struct dir_struct *dir, +

Re: [PATCH 1/2] t3312-notes-empty: Test that 'git notes' removes empty notes by default

2014-11-04 Thread Eric Sunshine
On Tue, Nov 4, 2014 at 8:32 PM, Johan Herland jo...@herland.net wrote: Add test cases documenting the current behavior when trying to add/append/edit empty notes. This is in preparation for adding --allow-empty; to allow empty notes to be stored. Signed-off-by: Johan Herland jo...@herland.net

Re: [PATCH v2 21/22] mingw32: add uname()

2014-11-08 Thread Eric Sunshine
On Sat, Nov 8, 2014 at 4:39 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/compat/mingw.c b/compat/mingw.c index c5c37e5..b817678 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -2128,3 +2128,14 @@ void

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-08 Thread Eric Sunshine
On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: If the user enables untracked cache, then - move worktree to an unsupported filesystem - or simply upgrade OS - or move the whole (portable) disk from one machine to another - or access a shared fs from another

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

2014-11-08 Thread Eric Sunshine
On Sat, Nov 8, 2014 at 6:00 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This allows the callback to use 'base' as a temporary buffer to quickly assemble full path without extra allocation. The caller has to restore it afterwards of course. Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCHv4 9/9] t3301: Modernize

2014-11-10 Thread Eric Sunshine
On Mon, Nov 10, 2014 at 8:04 PM, Johan Herland jo...@herland.net wrote: On Mon, Nov 10, 2014 at 9:42 PM, Junio C Hamano gits...@pobox.com wrote: Johan Herland jo...@herland.net writes: Make this test script appear somewhat less old-fashioned: - Use test helper functions: - write_script

Re: mac test failure -- test 3301

2014-11-10 Thread Eric Sunshine
On Mon, Nov 10, 2014 at 7:17 PM, Michael Blume blume.m...@gmail.com wrote: the commit modernizing test 3301 (https://github.com/git/git/commit/fbe4f74865acfd) appears to break it on my mac $ ./t3301-notes.sh -v expecting success: MSG=b4 git notes add test_path_is_missing

Re: [PATCHv5 9/9] t3301: Modernize

2014-11-11 Thread Eric Sunshine
On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland jo...@herland.net wrote: Make this test script appear somewhat less old-fashioned: Signed-off-by: Johan Herland jo...@herland.net --- diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 416ed9e..861c159 100755 --- a/t/t3301-notes.sh +++

Re: git docs typo - patch

2014-11-12 Thread Eric Sunshine
On Wed, Nov 12, 2014 at 2:17 PM, Joe DF jo...@live.ca wrote: Hello, i have a patch here for the git docs. There is a typo. See: https://github.com/git/git/pull/103/files cheers, Thanks. This is fixed already [1] in the git master branch. [1]:

Re: [PATCH 06/10] cat-file: add --batch-check=format

2013-07-10 Thread Eric Sunshine
On Wed, Jul 10, 2013 at 7:45 AM, Jeff King p...@peff.net wrote: The `cat-file --batch-check` command can be used to quickly get information about a large number of objects. However, it provides a fixed set of information. This patch adds an optional format option to --batch-check to allow a

[RFC/PATCH 2/4] t4203: test check-mailmap command invocation

2013-07-10 Thread Eric Sunshine
Test the command-line interface of check-mailmap. (Actual .mailmap functionality is already covered by existing tests.) Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t4203-mailmap.sh | 50 ++ 1 file changed, 50 insertions(+) diff

[RFC/PATCH 1/4] builtin: add git-check-mailmap command

2013-07-10 Thread Eric Sunshine
. Consequently, script authors need not re-implement .mailmap functionality manually, thus avoiding potential quirks and behavioral differences. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- .gitignore | 1 + Makefile | 1 + builtin.h

[RFC/PATCH 3/4] t4203: test mailmap functionality directly rather than indirectly

2013-07-10 Thread Eric Sunshine
With the introduction of check-mailmap, it is now possible to check .mailmap functionality directly rather than indirectly as a side-effect of other commands (such as git-shortlog), therefore, do so. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t4203-mailmap.sh | 133

[RFC/PATCH 0/4] add git-check-mailmap command

2013-07-10 Thread Eric Sunshine
://article.gmane.org/gmane.comp.version-control.git/224782/ [3]: http://article.gmane.org/gmane.comp.version-control.git/224783/ Eric Sunshine (4): builtin: add git-check-mailmap command t4203: test check-mailmap command invocation t4203: test mailmap functionality directly rather than indirectly t4203

[RFC/PATCH 4/4] t4203: consolidate test-repository setup

2013-07-10 Thread Eric Sunshine
of this seven-commit repository into a single repository-setup function. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- The code near the top of the file which creates two commits, and the code later which creates five commits have been consolidated into a single repository-setup function

Re: [RFC/PATCH 1/4] builtin: add git-check-mailmap command

2013-07-10 Thread Eric Sunshine
On Wed, Jul 10, 2013 at 10:31 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Jul 11, 2013 at 2:03 AM, Eric Sunshine sunsh...@sunshineco.com wrote: +static const struct option check_mailmap_options[] = { + OPT_BOOLEAN(0, stdin, use_stdin, + N_(also read contacts from

Re: [RFC/PATCH 1/4] builtin: add git-check-mailmap command

2013-07-11 Thread Eric Sunshine
On Thu, Jul 11, 2013 at 2:45 AM, Antoine Pelisse apeli...@gmail.com wrote: On Wed, Jul 10, 2013 at 9:03 PM, Eric Sunshine sunsh...@sunshineco.com wrote: +static void check_mailmap(struct string_list *mailmap, const char *contact) +{ + const char *name, *mail; + size_t namelen

[PATCH v2 1/4] builtin: add git-check-mailmap command

2013-07-11 Thread Eric Sunshine
. Consequently, script authors need not re-implement .mailmap functionality manually, thus avoiding potential quirks and behavioral differences. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- .gitignore | 1 + Documentation/git-check-mailmap.txt| 55

[PATCH v2 3/4] t4203: test mailmap functionality directly rather than indirectly

2013-07-11 Thread Eric Sunshine
With the introduction of check-mailmap, it is now possible to check .mailmap functionality directly rather than indirectly as a side-effect of other commands (such as git-shortlog), therefore, do so. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t4203-mailmap.sh | 133

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