Re: What's cooking in git.git (Dec 2013, #05; Thu, 26)

2013-12-27 Thread Eric Sunshine
On Thu, Dec 26, 2013 at 4:08 PM, Junio C Hamano gits...@pobox.com wrote: Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. You can find the changes described here in the integration

Re: What's cooking in git.git (Dec 2013, #05; Thu, 26)

2014-01-02 Thread Eric Sunshine
On Thu, Jan 2, 2014 at 4:11 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Fri, Dec 27, 2013 at 5:13 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Thu, Dec 26, 2013 at 4:08 PM, Junio C Hamano gits

[PATCH v2] name-hash: retire unused index_name_exists()

2014-01-02 Thread Eric Sunshine
ago and there are no in-flight topics referencing index_name_exists(), retire it. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- The only difference from v1 [1] is that a comment added by kb/fast-hashmap in 'next' referencing obsolete index_name_exists() is also adjusted. [1]: http

Re: [PATCH 03/11] git p4: work around p4 bug that causes empty symlinks

2014-01-21 Thread Eric Sunshine
On Tue, Jan 21, 2014 at 6:16 PM, Pete Wyckoff p...@padd.com wrote: Damien Gérard highlights an interesting problem. Some p4 repositories end up with symlinks that have an empty target. It is not possible to create this with current p4, but they do indeed exist. The effect in git p4 is that

Re: [PATCH 06/11] git p4 test: run as user author

2014-01-21 Thread Eric Sunshine
On Tue, Jan 21, 2014 at 6:16 PM, Pete Wyckoff p...@padd.com wrote: The tests use aut...@example.com as the canonical submitter, but he does not have an entry in the p4 users database. This causes the generated change description to complain that the git and p4 users disagree. The complaint

Re: [PATCH v2 6/9] Pass directory indicator to match_pathspec_item()

2014-01-24 Thread Eric Sunshine
On Fri, Jan 24, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index af5134b..167af53 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -110,4 +110,21 @@ test_expect_success 'diff-tree -r

Re: [PATCH] doc: remote author/documentation sections from more pages

2014-01-26 Thread Eric Sunshine
On Sun, Jan 26, 2014 at 6:43 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Subject: [PATCH] doc: remote author/documentation sections from more pages s/remote/remove/ We decided at 48bb914e (doc: drop author/documentation sections from most pages, 2011-03-11) to remove author and

Re: [PATCH v3 17/17] Documentation: add documentation for 'git interpret-trailers'

2014-01-26 Thread Eric Sunshine
On Sun, Jan 26, 2014 at 12:00 PM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt new file mode 100644 index 000..f74843e ---

Re: [PATCH v5 1/4] submodule: Make 'checkout' update_module explicit

2014-01-26 Thread Eric Sunshine
On Sun, Jan 26, 2014 at 3:45 PM, W. Trevor King wk...@tremily.us wrote: This avoids the current awkwardness of having either '' or 'checkout' for checkout-mode updates, which makes testing for checkout-mode updates (or non-checkout-mode updates) easier. Signed-off-by: W. Trevor King

Re: [PATCH 5/5] builtin/commit.c: reduce scope of variables

2014-01-29 Thread Eric Sunshine
On Wed, Jan 29, 2014 at 8:48 AM, Elia Pinto gitter.spi...@gmail.com wrote: diff --git a/builtin/commit.c b/builtin/commit.c index 3767478..eea4421 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1510,7 +1511,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix)

Re: [PATCH v4 01/17] Add data structures and basic functions for commit trailers

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 4:50 PM, Jeff King p...@peff.net wrote: I think we could do this with something like the patch below, which checks two things: 1. When we expand the ewah, it has the same number of bits we claimed in the on-disk header. 2. The ewah header matches the number

Re: [PATCH v4 05/17] strbuf: add strbuf_isspace()

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This helper function checks if a strbuf contains only space chars or not. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/strbuf.c b/strbuf.c index 83caf4a..2124bb8 100644 ---

Re: [PATCH v4 12/17] strbuf: add strbuf_replace()

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/strbuf.c b/strbuf.c index 2124bb8..e45e513 100644 --- a/strbuf.c +++ b/strbuf.c @@ -197,6 +197,13 @@ void strbuf_splice(struct strbuf

Re: [PATCH v4 02/17] trailer: process trailers from file and arguments

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch implements the logic that process trailers from file and arguments. At the beginning trailers from file are in their own infile_tok doubly linked list, and trailers from arguments are in their own

Re: [PATCH v4 03/17] trailer: read and process config information

2014-01-31 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch implements reading the configuration to get trailer information, and then processing it and storing it in a doubly linked list. The config information is stored in the list whose first item is pointed

Re: [PATCH v4 08/17] trailer: add interpret-trailers command

2014-01-31 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch adds the git interpret-trailers command. This command uses the previously added process_trailers() function in trailer.c. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git

Re: [PATCH v4 04/17] trailer: process command line trailer arguments

2014-01-31 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch parses the trailer command line arguments and put the result into an arg_tok doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/trailer.c b/trailer.c index

Re: [PATCH v4 06/17] trailer: parse trailers from input file

2014-01-31 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch reads trailers from an input file, parses them and puts the result into a doubly linked list. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- trailer.c | 62

Re: [PATCH v4 10/17] trailer: if no input file is passed, read from stdin

2014-02-02 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: It is simpler and more natural if the git interpret-trailers is made a filter as its output already goes to sdtout. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/trailer.c b/trailer.c

Re: [PATCH v4 11/17] trailer: add new_trailer_item() function

2014-02-02 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This is a small refactoring to prepare for the next steps. Since this is all brand new code, wouldn't it make more sense to structure it in this fashion in the first place when introduced in patch 4/17? It's not

Re: [PATCH v3 17/17] Documentation: add documentation for 'git interpret-trailers'

2014-02-02 Thread Eric Sunshine
Patch 17/17 of v4 failed to arrive in my inbox for some reason, so I'll just reply to v3 since there's another error I noticed which is still present in v4, plus a comment specific to v4 (see below). On Mon, Jan 27, 2014 at 3:33 PM, Christian Couder chrisc...@tuxfamily.org wrote: From: Eric

Re: [PATCH 1/3] gitk: refactor: separate generic hunk parsing out of find_hunk_blamespecs{}

2014-02-03 Thread Eric Sunshine
On Mon, Feb 3, 2014 at 5:41 PM, Max Kirillov m...@max630.net wrote: For requesting a region blame, it is necessary to parse a hunk and find the region in the parent file corresponding to the selected region. There is already hunk parsin functionality in the find_hunk_blamespec{},

Re: [PATCH 03/13] Makefile: introduce make-var helper function

2014-02-06 Thread Eric Sunshine
On Wed, Feb 5, 2014 at 12:50 PM, Jeff King p...@peff.net wrote: It's a common pattern in our Makefile to echo some make variables into a file, but only if they are different from a previous run. This sentinel file can then be used as a dependency to trigger rebuilds when the make variable

Re: [PATCH 6/6] fetch-pack: fix deepen shallow over smart http with no-done cap

2014-02-06 Thread Eric Sunshine
On Thu, Feb 6, 2014 at 10:10 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh index b0fa738..fb11073 100755 --- a/t/t5537-fetch-shallow.sh +++ b/t/t5537-fetch-shallow.sh @@ -200,5 +200,29 @@ EOF ) ' +# This test is

Re: [PATCH v4 7/9] rebase: parse options in stuck-long mode

2014-02-09 Thread Eric Sunshine
On Sun, Feb 9, 2014 at 8:03 PM, brian m. carlson sand...@crustytoothpaste.net wrote: From: Nicolas Vigier bo...@mars-attacks.org There is no functionnal change. The reason for this change is to be able s/functionnal/functional/ to add a new option taking an optional argument.

Re: [PATCH v5 14/14] Documentation: add documentation for 'git interpret-trailers'

2014-02-09 Thread Eric Sunshine
On Thu, Feb 6, 2014 at 3:20 PM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt new file mode 100644 index 000..0617941 ---

Re: [PATCH v5 01/14] Add data structures and basic functions for commit trailers

2014-02-09 Thread Eric Sunshine
On Sun, Feb 9, 2014 at 8:48 AM, Christian Couder chrisc...@tuxfamily.org wrote: From: Junio C Hamano gits...@pobox.com Christian Couder chrisc...@tuxfamily.org writes: +static inline int same_trailer(struct trailer_item *a, struct trailer_item *b, int alnum_len) +{ +return

Re: [PATCH] notes: Disallow reusing non-blob as a note object

2014-02-14 Thread Eric Sunshine
On Wed, Feb 12, 2014 at 4:54 AM, Johan Herland jo...@herland.net wrote: Currently git notes add -C $object will read the raw bytes from $object, and then copy those bytes into the note object, which is hardcoded to be of type blob. This means that if the given $object is a non-blob (e.g. tree

Re: [PATCH 3/3] read-cache: add index.version config variable

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 2:23 PM, Thomas Gummerer t.gumme...@gmail.com wrote: Add a config variable that allows setting the default index version when initializing a new index file. Similar to the GIT_INDEX_VERSION environment variable this only affects new index files. Signed-off-by: Thomas

Re: [PATCH 3/3] config: teach git config --file - to read from the standard input

2014-02-15 Thread Eric Sunshine
On Fri, Feb 14, 2014 at 6:37 PM, Kirill A. Shutemov kir...@shutemov.name wrote: The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path.

Re: [PATCH v2] reset: optionally setup worktree and refresh index on --mixed

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 9:28 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Refreshing index requires work tree. So we have to options: always set s/to/two/ up work tree (and refuse to reset if failing to do so), or make refreshing index optional. As refreshing index is not the main

Re: [PATCH 3/3] commit: add --cleanup=scissors

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 10:37 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the commit message - 2013-12-05) we have a less fragile way to cut out git status at the end of a commit message but it's only enabled for

Re: [PATCH] web--browse: Use powershell on Windows

2014-02-16 Thread Eric Sunshine
On Sun, Feb 16, 2014 at 2:22 AM, Steven Penny svnp...@gmail.com wrote: On Windows you can have either MinGW or Cygwin. As has been shown in this script MinGW uses start while Cygwin uses cygstart. The cygstart command is robust but the start command breaks on certain URLs $ git

Re: [PATCH] tag: support --sort=version

2014-02-19 Thread Eric Sunshine
On Wed, Feb 19, 2014 at 8:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: --sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- diff --git

Re: [PATCH v3 23/25] checkout: detach if the branch is already checked out elsewhere

2014-02-19 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The normal rule is anything outside refs/heads/ is detached. This strictens the rule a bit more: if the branch is checked out (either in s/strictens/increases strictness of/ $GIT_COMMON_DIR/HEAD or any

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The pruning rules are: - if $REPO/locked exists, repos/id is not supposed to be pruned. - if $REPO/locked exists and $REPO/gitdir's mtimer is older than a s/mtimer/mtime/ really long limit, warn about old

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Eric Sunshine
On Wed, Feb 19, 2014 at 5:08 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +static dev_t get_device_or_die(const char *path) +{ + struct stat buf; + if (stat(path, buf)) + die_errno

Re: [PATCH v3 14/25] setup.c: convert is_git_directory() to use strbuf

2014-02-20 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 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 --- index 73e80ce..aec9fdb 100644 --- a/strbuf.h +++ b/strbuf.h @@ -116,6 +116,10 @@ extern void strbuf_add(struct strbuf *, const void *, size_t); static

Re: [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

2014-02-23 Thread Eric Sunshine
On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote: Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave the worktree untouched. Expose this with a new strategy option so that scripts can use it. Signed-off-by: Junio C Hamano

Re: [PATCH v2 7/8] name-hash: allow dir hashing even when !ignore_case

2014-02-23 Thread Eric Sunshine
On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote: The directory hash (for fast checks if the index already has a directory) was only used in ignore_case mode and so depended on that flag. Make it generally available on request. Signed-off-by: Thomas Rast

Re: [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged

2014-02-23 Thread Eric Sunshine
On Sun, Feb 23, 2014 at 6:57 AM, Thomas Rast t...@thomasrast.ch wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote: Using the new no_worktree flag from the previous commit, we can teach merge-recursive to leave

Re: [PATCH v3 10/25] Add new environment variable $GIT_COMMON_DIR

2014-02-25 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:39 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 working

Re: [PATCH v3 10/25] Add new environment variable $GIT_COMMON_DIR

2014-02-26 Thread Eric Sunshine
On Wed, Feb 26, 2014 at 11:12 AM, Philip Oakley philipoak...@iee.org wrote: From: Duy Nguyen pclo...@gmail.com On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine sunsh...@sunshineco.com wrote: +'GIT_COMMON_DIR':: + If this variable is set to a path, non-worktree files

Re: [PATCH v3 10/25] Add new environment variable $GIT_COMMON_DIR

2014-02-26 Thread Eric Sunshine
On Wed, Feb 26, 2014 at 5:55 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine sunsh...@sunshineco.com wrote: +'GIT_COMMON_DIR':: + If this variable is set to a path, non-worktree files that are + normally in $GIT_DIR will be taken from

Re: [PATCH v3 21/25] checkout: support checking out into a new working directory

2014-02-26 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 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: Doc target fails to parse user-manual.xml

2014-02-26 Thread Eric Sunshine
On Wed, Feb 26, 2014 at 11:13 AM, Leo R. Lundgren l...@finalresort.org wrote: I'm installing git 1.9.0 from source, on a freshly installed SLES 11 SP3. The git binaries work fine to compile and install, but `make doc` fails on some XML parsing errors. The system is fully updated with the

Re: [PATCH v3 21/25] checkout: support checking out into a new working directory

2014-02-26 Thread Eric Sunshine
On Wed, Feb 26, 2014 at 6:19 PM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Feb 27, 2014 at 3:06 AM, Eric Sunshine sunsh...@sunshineco.com wrote: + len = strlen(path); + if (!len || is_dir_sep(path[len - 1])) + die(_('--to' argument '%s' cannot end with a slash

Re: [PATCH 1/2] fetch: add a failing test for prunning with overlapping refspecs

2014-02-27 Thread Eric Sunshine
On Thu, Feb 27, 2014 at 4:00 AM, Carlos Martín Nieto c...@elego.de wrote: Subject: fetch: add a failing test for prunning with overlapping refspecs s/prunning/pruning/ Signed-off-by: Carlos Martín Nieto c...@elego.de --- diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index

Re: [PATCH 1/2] fetch: add a failing test for prunning with overlapping refspecs

2014-02-27 Thread Eric Sunshine
On Thu, Feb 27, 2014 at 4:00 AM, Carlos Martín Nieto c...@elego.de wrote: Subject: fetch: add a failing test for prunning with overlapping refspecs s/prunning/pruning/ Signed-off-by: Carlos Martín Nieto c...@elego.de --- diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index

Re: [PATCH] Problem in bulk-checkin.c:finish_bulk_checkin() Unable to fix

2014-02-27 Thread Eric Sunshine
On Thu, Feb 27, 2014 at 7:04 PM, Faiz Kothari faiz.of...@gmail.com wrote: Signed-off-by: Faiz Kothari faiz.of...@gmail.com --- Compiles without errors. Fails in test t/t1050-large.sh ,fails 12/15 tests. Dumps memory map and backtrace. Somewhere its not able to free(): invalid pointer.

Re: [PATCH] rewrite bulk-checkin.c:finish_bulk_checkin() using strbuf

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 2:58 AM, Faiz Kothari faiz.of...@gmail.com wrote: Signed-off-by: Faiz Kothari faiz.of...@gmail.com Notes: I finally got what's happening, and why the errors were caused. packname is supposed to contain the complete path to the .pack file. Packs are stored

Re: [PATCH] Rewrite bulk-checkin.c:finish_bulk_checkin() to use a strbuf for handling packname

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 3:28 AM, Sun He sunheeh...@gmail.com wrote: Signed-off-by: Sun He sunheeh...@gmail.com --- Nicely done. Due to the necessary changes to finish_tmp_packfile(), the focus of this patch has changed slightly from that suggested by the microproject. It's really now about

Re: [PATCH] Rewrite bulk-checkin.c:finish_bulk_checkin() to use a strbuf for handling packname

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 4:46 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Feb 28, 2014 at 3:28 AM, Sun He sunheeh...@gmail.com wrote: Signed-off-by: Sun He sunheeh...@gmail.com --- Nicely done. Due to the necessary changes to finish_tmp_packfile(), the focus of this patch has

Re: [PATCH] Rewrite bulk-checkin.c:finish_bulk_checkin() to use a strbuf for handling packname

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 9:17 AM, 孙赫 sunheeh...@gmail.com wrote: 2014-02-28 21:12 GMT+08:00 Eric Sunshine [via git] ml-node+s661346n760450...@n2.nabble.com: On Fri, Feb 28, 2014 at 4:46 AM, Eric Sunshine [hidden email] wrote: On Fri, Feb 28, 2014 at 3:28 AM, Sun He [hidden email] wrote

Re: [PATCH] Rewrite bulk-checkin.c:finish_bulk_checkin() to use a strbuf for handling packname

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 10:54 AM, 孙赫 sunheeh...@gmail.com wrote: 2014-02-28 17:47 GMT+08:00 Eric Sunshine [via git] ml-node+s661346n7604473...@n2.nabble.com: On Fri, Feb 28, 2014 at 3:28 AM, Sun He [hidden email] wrote: Signed-off-by: Sun He [hidden email] --- diff --git a/builtin/pack

Re: [PATCH] rewrite bulk-checkin.c:finish_bulk_checkin() using strbuf

2014-02-28 Thread Eric Sunshine
On Fri, Feb 28, 2014 at 1:27 PM, Faiz Kothari faiz.of...@gmail.com wrote: Thanks for the suggestions and remarks. [Administrivia: On this list, top-posting is frowned upon; inline responses are preferred.] I rewrote bulk-checkin.c:finish_bulk_checkin() using strbuf. But saw that Sun He has

Re: [PATCH v2] implemented strbuf_write_or_die()

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:18 PM, Faiz Kothari faiz.of...@gmail.com wrote: Subject: implemented strbuf_write_or_die() Imperative tone is preferred. The commit message tells what it is doing, not what it did. Subject: introduce strbuf_write_or_die() Signed-off-by: Faiz Kothari

Re: [PATCH v2] implemented strbuf_write_or_die()

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:47 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 7:18 PM, Faiz Kothari faiz.of...@gmail.com wrote: Implementing this clearly distinguishes between writing a normal buffer and writing a strbuf. Also, it provides an interface to write strbuf

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:51 AM, He Sun sunheeh...@gmail.com wrote: 2014-03-01 19:21 GMT+08:00 Faiz Kothari faiz.of...@gmail.com: diff --git a/remote-curl.c b/remote-curl.c index 10cb011..dee8716 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -634,7 +634,7 @@ static int rpc_service(struct

Re: [PATCH v2] Replace tmpname with pack_tmp_name in warning. The developer mistook tmpname for pack_tmp_name.

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:43 PM, Sun He sunheeh...@gmail.com wrote: Subject: Replace tmpname with pack_tmp_name in warning. The developer mistook tmpname for pack_tmp_name. The subject should be a short summary of the change, and the rest of the commit message before the --- line provides extra

Re: [PATCH v2] Place cache.h at the first place to match general rule

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:18 PM, Sun He sunheeh...@gmail.com wrote: Signed-off-by: Sun He sunheeh...@gmail.com Helped-by: Duy Nguyen pclo...@gmail.com Footers should follow a temporal order. For instance: 1. Duy helped you. 2. You revised your patch based upon his input. 3. You signed off

Re: [PATCH][GSoC] git-compat-util.h:rewrite skip_prefix() as loop

2014-03-01 Thread Eric Sunshine
Thanks for the submission. Minor comments below to give you a taste of what it's like to contribute to this project... On Sat, Mar 1, 2014 at 5:42 PM, kgeorgiou kyriakos.a.georg...@gmail.com wrote: Subject: git-compat-util.h:rewrite skip_prefix() as loop Space after colon. You might be able to

Re: [PATCH] git-compat-util.h:rewrite skip_prefix() as loop

2014-03-01 Thread Eric Sunshine
Thanks for the submission. Minor comments below to give you a taste of what it's like to contribute to this project... On Sat, Mar 1, 2014 at 8:32 AM, Siddharth Goel siddharth98...@gmail.com wrote: Rewrote skip_prefix() function so that prefix is scanned once. Good description. In this project,

Re: [PATCH] git-compat-util.h:rewrite skip_prefix() as loop

2014-03-01 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 10:22 PM, Siddharth Goel siddharth98...@gmail.com wrote: To my surprise, git format-patch had removed the Git Notes that I had put to my commit (regarding GSoC). I have written this patch as a part of the GSoC 2014 MicroProject for Git. You probably wanted to use the

Re: [PATCH 2/3] rebase: accept -number as another way of saying HEAD~number

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is rev-list style, where people can do git rev-list -3 in addition to git rev-list HEAD~3. A lot of commands are driven by the revision machinery and also accept this form. This addition to rebase is just for

Re: [PATCH 2/3] rebase: accept -number as another way of saying HEAD~number

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is rev-list style, where people can do git rev-list -3 in addition to git rev-list HEAD~3. A lot of commands are driven by the revision machinery and also accept this form. This addition to rebase is just for

Re: [PATCH 2/3] rebase: accept -number as another way of saying HEAD~number

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 3:53 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This is rev-list style, where people can do git rev-list -3 in addition to git rev-list HEAD~3. A lot of commands are driven

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the todo list for you to edit only commit XYZ to save your time. The time saving is

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 4:04 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares

Re: [PATCH v3] write_pack_file: use correct variable in diagnostic

2014-03-02 Thread Eric Sunshine
by Eric Sunshine. Thanks to him. builtin/pack-objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c733379..4922ce5 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -823,7 +823,7 @@ static

Re: [PATCH v2] skip_prefix:rewrite so that prefix is scanned once

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 10:03 AM, Siddharth Goel siddharth98...@gmail.com wrote: Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Siddharth Goel siddharth98...@gmail.com --- Thanks a lot Eric for your valuable comments. Please let me know if there is anything else which needs

Re: [PATCH v4 01/27] path.c: make get_pathname() return strbuf instead of static buffer

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:12 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: We've been avoiding PATH_MAX whenever possible. This patch makes get_pathname() return a strbuf and updates the callers to take advantage of this. The code is simplified as we no longer need to worry about buffer

Re: [PATCH v3 1/2] Introduce strbuf_write_or_die()

2014-03-02 Thread Eric Sunshine
and prototype added to strbuf.h Also, replaced if(!sbuf) with assert(sbuf) and split the patch into two as pointed out by Eric Sunshine. Good explanation of what changed since the last attempt. As far as justification is concerned, I am not able to come up with a satisfactory justification. Apart from

Re: [PATCH v3 2/2] use strbuf_write_or_die()

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 2:34 AM, Faiz Kothari faiz.of...@gmail.com wrote: Signed-off-by: Faiz Kothari faiz.of...@gmail.com Sign off below commit message. Used strbuf.c:strbuf_write_or_die() instead of write_or_die.c:write_or_die() at relevant places. Imperative: Use strbuf... Otherwise, the

Re: [PATCH] Replace memcpy with hashcpy when lengths defined

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 2:19 PM, Alberto albco...@gmail.com wrote: From: Alberto Corona albco...@gmail.com Replaced memcpy with hashcpy where lengts in memcpy are already defined. This doesn't really explain what this patch is attempting to do. What does lengths already defined mean? It's also

Re: [PATCH v2] branch.c: change install_branch_config() to use skip_prefix()

2014-03-02 Thread Eric Sunshine
Thanks for the submission. Comments below to give you a taste of the Git review process... On Sun, Mar 2, 2014 at 10:55 AM, Guanglin Xu mzguang...@gmail.com wrote: Change install_branch_config() to use skip_prefix() and make it conform to the usage of previous starts_with(). This is because

Re: [PATCH v4 02/27] Convert git_snpath() to strbuf_git_path()

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:12 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: In the previous patch, git_snpath() is modified to allocate a new strbuf buffer because vsnpath() needs that. But that makes it awkward because git_snpath() receives a pre-allocated buffer from outside and has to

Re: [PATCH v4 05/27] Make git_path() aware of file relocation in $GIT_DIR

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:12 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: We allow the user to relocate certain paths out of $GIT_DIR via environment variables, e.g. GIT_OBJECT_DIRECTORY, GIT_INDEX_FILE and GIT_GRAFT_FILE. All callers are not supposed to use git_path() or All callers are

Re: [PATCH v4 10/27] Add new environment variable $GIT_COMMON_DIR

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:12 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 working

Re: [PATCH v2] finish_tmp_packfile():use strbuf for pathname construction

2014-03-02 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:29 PM, Sun He sunheeh...@gmail.com wrote: Signed-off-by: Sun He sunheeh...@gmail.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Michael Haggerty mhag...@alum.mit.edu --- This patch has assumed that you have already fix the bug of tmpname in builtin

Re: [PATCH v3] Place cache.h at the first place to match general rule

2014-03-02 Thread Eric Sunshine
on each line of commit message. Helped-by: Duy Nguyen pclo...@gmail.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Sun He sunheeh...@gmail.com --- PATCH v3 fix the position of information I want to convey to readers, with the directions of Eric Sunshine. sigchain.c

Re: [PATCH v2] Replace memcpy with hashcpy when dealing hash copy globally

2014-03-02 Thread Eric Sunshine
On Sun, Mar 2, 2014 at 4:37 AM, Sun He sunheeh...@gmail.com wrote: Replacing memcpy with hashcpy is more directly and elegant. A better explanation is that the change takes advantage of the abstraction provided by hashcpy() rather than hardcoding knowledge about a particular hash

Re: [PATCH v4] branch.c: change install_branch_config() to use skip_prefix()

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 1:36 AM, Guanglin Xu mzguang...@gmail.com wrote: to avoid a magic code of 11. Helped-by: Sun He sunheeh...@gmail.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Jacopo Notarstefano jaco...@gmail.com Signed-off-by: Guanglin Xu mzguang...@gmail.com

Re: [PATCH v3 00/11] Use ALLOC_GROW() instead of inline code

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 2:18 AM, Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru wrote: Dmitry S. Dolzhenko (11): builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() bundle.c: use ALLOC_GROW() in add_to_ref_list() cache-tree.c: use ALLOC_GROW() in find_subtree() commit.c:

Re: [PATCH v4 12/27] *.sh: avoid hardcoding $GIT_DIR/hooks/...

2014-03-03 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 7:12 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not $GIT_DIR/hooks/. Just let rev-parse --git-path handle it. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- git-am.sh

Re: [PATCH] commit.c: Replace starts_with() with skip_prefix()

2014-03-03 Thread Eric Sunshine
Thanks for the submission. Some commentary below to expose you to the review process on this project... On Mon, Mar 3, 2014 at 2:47 AM, Karthik Nayak karthik@gmail.com wrote: Replace with skip_prefix(), which uses the inbuilt function strcmp() to compare. Explaining the purpose of the

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 1:31 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Sat, Mar 1, 2014 at 7:51 AM, He Sun sunheeh...@gmail.com wrote: 2014-03-01 19:21 GMT+08:00 Faiz Kothari faiz.of...@gmail.com: diff --git a/remote-curl.c b/remote-curl.c

Re: [PATCH] commit.c:record_author_date() use skip_prefix() instead of starts_with()

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Michael Haggerty mhag...@alum.mit.edu writes: -if (!starts_with(buf, author )) { +if (!skip_prefix(buf, author )) { If this is the only change, there is not much point, is there? How does this

Re: [PATCH 3/3] rebase: new convenient option to edit a single commit

2014-03-03 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: git rebase -e XYZ is basically the same as EDITOR=sed -i '1s/pick XYZ/edit XYZ/' $@ \ git rebase -i XYZ^ In English, it prepares the todo list for you to edit only commit XYZ to save your time. The time saving is

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Mon, Mar 3, 2014 at 1:31 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: It's not obvious from the patch fragment, but 'heads

Re: Help needed: Tests failed While replacing char array with strbuf in bulk-checkin.c

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 4:11 PM, saikrishna.sripada saikrishna.srip...@students.iiit.ac.in wrote: I am trying do complete the microproject 4, inorder to apply to GSOC. I have made the below changes: https://gist.github.com/anhsirksai/9334565 Post my changes compilation is succes in the source

Re: [PATCH 1/2] test-lib: tests skipped by GIT_SKIP_TESTS say so

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: We used to show (missing ) next to tests skipped because they are specified in GIT_SKIP_TESTS. Use (matched by GIT_SKIP_TESTS) instead. Bikeshedding: That's pretty verbose. Perhaps just say (excluded)? --- t/test-lib.sh

Re: [PATCH 2/2] test-lib: GIT_TEST_ONLY to run only specific tests

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr ilya.bo...@gmail.com wrote: This is a counterpart to GIT_SKIP_TESTS. Mostly useful when debugging. To be grammatically similar to GIT_SKIP_TESTS, perhaps name it GIT_RUN_TESTS? --- t/README | 15 +++ t/test-lib.sh |8

Re: [PATCH] commit.c: Replace starts_with() with skip_prefix()

2014-03-03 Thread Eric Sunshine
On Mon, Mar 3, 2014 at 10:23 AM, karthik nayak karthik@gmail.com wrote: Hello Eric, Thanks for Pointing out everything, i had a thorough look and fixed a couple of things. Here is an Updated Patch. - Removed unnecessary code and variables. - Replaced all instances of starts_with() with

Re: [PATCH v4 19/27] wrapper.c: wrapper to open a file, fprintf then close

2014-03-03 Thread Eric Sunshine
On Sat, Mar 1, 2014 at 12:11 PM, Torsten Bögershausen tbo...@web.de wrote: On 2014-03-01 13.12, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h | 2 ++ wrapper.c | 31 +++ 2 files changed, 33 insertions(+) diff

Re: [PATCH] [PATCH] commit.c: Replace starts_with() with skip_prefix()

2014-03-04 Thread Eric Sunshine
Thanks for the resend. Etiquette on this list is to cc: people who commented on previous versions of the submission. As Tanay already mentioned, use [PATCH vN] in the subject where N is the version number of this attempt. The -v option of git format-email can help. More below. On Tue, Mar 4,

Re: [PATCH] [PATCH] commit.c: Replace starts_with() with skip_prefix()

2014-03-04 Thread Eric Sunshine
On Tue, Mar 4, 2014 at 12:58 PM, karthik nayak karthik@gmail.com wrote: Hey Tanay, 1. Yes just getting used to git send-email now, should follow that from now 2. I thought it shouldn't be a part of the commit, so i put it after the last --- 3. I did have a thought on your lines also ,

Re: [PATCH] [PATCH] commit.c: Replace starts_with() with skip_prefix()

2014-03-04 Thread Eric Sunshine
On Tue, Mar 4, 2014 at 5:27 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Mar 4, 2014 at 10:54 AM, Karthik Nayak karthik@gmail.com wrote: diff --git a/commit.c b/commit.c index 6bf4fe0..71a03e3 100644 --- a/commit.c +++ b/commit.c @@ -1193,10 +1196,8 @@ static void

Re: [PATCH] disable grafts during fetch/push/bundle

2014-03-04 Thread Eric Sunshine
On Tue, Mar 4, 2014 at 12:48 PM, Jeff King p...@peff.net wrote: diff --git a/commit.c b/commit.c index 6bf4fe0..886dbfe 100644 --- a/commit.c +++ b/commit.c @@ -114,6 +114,11 @@ static unsigned long parse_commit_date(const char *buf, const char *tail) static struct commit_graft

  1   2   3   4   5   6   7   8   9   10   >