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

2014-03-02 12:34 GMT+08:00 Eric Sunshine sunsh...@sunshineco.com: 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.

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

The general rule is if cache.h or git-compat-util.h is included, it is the first #include. As builtin.h starts with git-compat-util.h, files that start with builtin.h are not changed. Helped-by: Duy Nguyen pclo...@gmail.com Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Sun

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

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

On Sun, Mar 2, 2014 at 3:37 PM, 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 by the

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

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

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 by the

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

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

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 the

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

Replacing memcpy with hashcpy is more directly and elegant. Leave ppc/sha1.c alone, as it is an isolated component. Pull cache.h(actually ../cache.h) in just for one memcpy there is not proper. Helped-by: Michael Haggerty mhag...@alum.mit.edu Helped-by: Duy Nguyen pclo...@gmail.com

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

GSoC2014 Microproject: according to the idea#2 for microprojects, change install_branch_config() to use skip_prefix() and make it conform to the usage of previous starts_with(). Signed-off-by: Guanglin Xu mzguang...@gmail.com --- branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

The part about this being a GSoC microproject should go below the three dashes, since it's not information that needs to be recorded in the codebase. On Sun, Mar 2, 2014 at 12:52 PM, Guanglin Xu mzguang...@gmail.com wrote: GSoC2014 Microproject: according to the idea#2 for microprojects, change

Re: [BUG] Halt during fetch on MacOS

On 01.03.2014, at 00:26, Conley Owens c...@android.com wrote: $ git --version # This is just the git from MacPorts git version 1.8.5.5 $ sw_vers ProductName:Mac OS X ProductVersion: 10.8.5 BuildVersion: 12F45 I cannot reproduce this, neither with 1.8.5.5 nor with 1.9.0. I am also

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

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 to be modified in this patch. git-compat-util.h | 7 +-- 1 file changed, 5

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

Change install_branch_config() to use skip_prefix() and make it conform to the usage of previous starts_with(). This is because the proper usage of skip_prefix() overrides the functionality of starts_with(). Thorough replacements may finally remove the starts_with() function and reduce code

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

Eric Sunshine sunsh...@sunshineco.com writes: 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

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

Hi Jacopo, Thanks for your comments. I just update this PATCH as v2. I appreciate more comments from you and others in the new thread. Regards, Guanglin 2014-03-02 22:01 GMT+08:00 Jacopo Notarstefano jacopo.notarstef...@gmail.com: The part about this being a GSoC microproject should go below

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

On Sun, Mar 2, 2014 at 2:30 AM, Sun He sunheeh...@gmail.com wrote: 'pack_tmp_name' is the subject of the utime() check, so report it in the warning, not the uninitialized 'tmpname' Signed-off-by: Sun He sunheeh...@gmail.com --- Changing the subject and adding valid information as tutored

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

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 to

[PATCH] Replace memcpy with hashcpy when lengths defined

From: Alberto Corona albco...@gmail.com Replaced memcpy with hashcpy where lengts in memcpy are already defined. Signed-off-by: Alberto Corona albco...@gmail.com --- bundle.c| 2 +- grep.c | 2 +- refs.c | 2 +- sha1_name.c | 4 ++-- 4 files changed, 5 insertions(+), 5

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

From: Alberto albco...@gmail.com From: Alberto Corona albco...@gmail.com Replaced memcpy with hashcpy where lengts in memcpy s/lengts/lengths/ are already defined. Signed-off-by: Alberto Corona albco...@gmail.com --- bundle.c| 2 +- grep.c | 2 +- refs.c | 2 +- sha1_name.c | 4

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

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

[PATCH] git-config: document interactive.singlekey requires Term::Readkey

Most distributions don't require Term::Readkey as dependency, leaving the user to wonder why the setting doesn't work. Signed-off-by: Simon Ruderich si...@ruderich.org --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt

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

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 Place your sign off below the commit message. Introduced a new function strbuf.c:strbuf_write_or_die() to the strbuf family of functions. Now use this API instead of

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

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

[BUGLET] resuming git am when using applypatch-msg hook

Hi, I don't know if this really counts as a bug but it is a little annoying from a user experience point of view. We're using an applypatch-msg hook to check that certain things (reviewer, bug entry etc) are recorded correctly in commit messages. My expectation is that if our applypatch-msg hook

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

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()

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: msysgit color scheme

On Fri, Feb 28, 2014 at 11:38 PM, Robert Dailey rcdailey.li...@gmail.com wrote: Is there a way to change color scheme in msysgit without going through the Properties Colors settings? Reason I ask is because I share the same HOME directory and .bashrc file between msysgit and cygwin, and it'd

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

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 01/27] path.c: make get_pathname() return strbuf instead of static buffer

On Mon, Mar 3, 2014 at 2:51 AM, Eric Sunshine sunsh...@sunshineco.com wrote: 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

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

On Mon, Mar 3, 2014 at 7:02 AM, Eric Sunshine sunsh...@sunshineco.com wrote: 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

Re: difftool sends malformed path to exernal tool on Windows

On Mon, Feb 24, 2014 at 8:44 AM, Paul Lotz pl...@lsst.org wrote: David, Thanks for the helpful reply. As you suggested, I modified the .gitconfig file to have: [difftool test] cmd = echo \$LOCAL\ \$REMOTE\ and ran $ git difftool -t test An example of the the resulting console

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

2014-03-03 2:42 GMT+08:00 Eric Sunshine sunsh...@sunshineco.com: On Sun, Mar 2, 2014 at 2:30 AM, Sun He sunheeh...@gmail.com wrote: 'pack_tmp_name' is the subject of the utime() check, so report it in the warning, not the uninitialized 'tmpname' Signed-off-by: Sun He sunheeh...@gmail.com ---

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

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 v2] branch.c: change install_branch_config() to use skip_prefix()

2014-03-03 6:56 GMT+08:00 Eric Sunshine sunsh...@sunshineco.com: 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

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

to avoid a magic code of 11. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Jacopo Notarstefano jaco...@gmail.com Signed-off-by: Guanglin Xu mzguang...@gmail.com --- This is an implementation of the idea#2 of GSoC 2014 microproject. branch.c | 2 +- 1 file changed, 1 insertion(+),

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

Helped-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Siddharth Goel siddharth98...@gmail.com --- Added a space after colon in the subject as compared to previous patch [PATCH v2]. [PATCH v2]: http://thread.gmane.org/gmane.comp.version-control.git/243150 git-compat-util.h | 7 +--

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

2014-03-03 10:24 GMT+08:00 Guanglin Xu mzguang...@gmail.com: to avoid a magic code of 11. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Jacopo Notarstefano jaco...@gmail.com Signed-off-by: Guanglin Xu mzguang...@gmail.com --- This is an implementation of the idea#2 of GSoC

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

2014-03-03 10:24 GMT+08:00 Guanglin Xu mzguang...@gmail.com: to avoid a magic code of 11. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Jacopo Notarstefano jaco...@gmail.com Signed-off-by: Guanglin Xu mzguang...@gmail.com --- This is an implementation of the idea#2 of GSoC

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

2014-03-03 13:39 GMT+08:00 He Sun sunheeh...@gmail.com: 2014-03-03 10:24 GMT+08:00 Guanglin Xu mzguang...@gmail.com: to avoid a magic code of 11. Helped-by: Eric Sunshine sunsh...@sunshineco.com Helped-by: Jacopo Notarstefano jaco...@gmail.com Signed-off-by: Guanglin Xu mzguang...@gmail.com

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

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 --- This is an implementation of the idea#2 of GSoC 2014 microproject. branch.c

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

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: use ALLOC_GROW() in register_commit_graft() diff.c: use ALLOC_GROW() diffcore-rename.c:

[PATCH v3 01/11] builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- builtin/pack-objects.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c733379..0ffad6f 100644 --- a/builtin/pack-objects.c +++

[PATCH v3 02/11] bundle.c: use ALLOC_GROW() in add_to_ref_list()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- bundle.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bundle.c b/bundle.c index e99065c..1388a3e 100644 --- a/bundle.c +++ b/bundle.c @@ -14,11 +14,7 @@ static const char bundle_signature[] = # v2 git

[PATCH v3 04/11] commit.c: use ALLOC_GROW() in register_commit_graft()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- commit.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..e004314 100644 --- a/commit.c +++ b/commit.c @@ -147,12 +147,8 @@ int register_commit_graft(struct

[PATCH v3 03/11] cache-tree.c: use ALLOC_GROW() in find_subtree()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- cache-tree.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43..30149d1 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -75,11 +75,7 @@ static struct cache_tree_sub

[PATCH v3 05/11] diff.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in diffstat_add() and diff_q() Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- diff.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index e800666..aebdfda 100644 --- a/diff.c +++ b/diff.c

[PATCH v3 06/11] diffcore-rename.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in locate_rename_dst() and register_rename_src() Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- diffcore-rename.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index

[PATCH v3 07/11] patch-ids.c: use ALLOC_GROW() in add_commit()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- patch-ids.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/patch-ids.c b/patch-ids.c index bc8a28f..bf81b92 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -83,10 +83,7 @@ static struct patch_id

[PATCH v3 08/11] replace_object.c: use ALLOC_GROW() in register_replace_object()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- replace_object.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/replace_object.c b/replace_object.c index cdcaf8c..843deef 100644 --- a/replace_object.c +++ b/replace_object.c @@ -36,12 +36,8 @@ static

[PATCH v3 09/11] reflog-walk.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in add_commit_info() and read_one_reflog() Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- reflog-walk.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/reflog-walk.c b/reflog-walk.c index b2fbdb2..2899729

[PATCH v3 10/11] dir.c: use ALLOC_GROW() in create_simplify()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- dir.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dir.c b/dir.c index 98bb50f..4ae38e4 100644 --- a/dir.c +++ b/dir.c @@ -1341,10 +1341,7 @@ static struct path_simplify *create_simplify(const char

[PATCH v3 11/11] attr.c: use ALLOC_GROW() in handle_attr_line()

Signed-off-by: Dmitry S. Dolzhenko dmitrys.dolzhe...@yandex.ru --- attr.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/attr.c b/attr.c index 8d13d70..734222d 100644 --- a/attr.c +++ b/attr.c @@ -338,12 +338,7 @@ static void handle_attr_line(struct attr_stack *res,

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

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

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

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

On Sun, Mar 2, 2014 at 3:31 AM, Sun He sunheeh...@gmail.com wrote: The general rule is if cache.h or git-compat-util.h is included, it is the first #include. As builtin.h starts with git-compat-util.h, files that start with builtin.h are not changed. Minor: Odd one-space indentation on

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

Replace with skip_prefix(), which uses the inbuilt function strcmp() to compare. Other Places were this can be implemented: commit.c : line 1117 commit.c : line 1197 Signed-off-by: Karthik Nayak karthik@gmail.com --- commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff

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

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