Re: My advice for GSoC applicants

2014-03-03 Thread Michael Haggerty
On 03/03/2014 11:29 PM, Junio C Hamano wrote: > [...] > Multiple students seem to be hitting the same microprojects (aka "we > are running out of micros"), which might be a bit unfortunate. I > think the original plan might have been that for a student candidate > to pass, his-or-her patch must hi

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 4:08 PM, Junio C Hamano wrote: Ilya Bobyr writes: It might be that we are looking at different use cases, as you are talking about whole test suits. I do not think so. Good :) I am trying to understand the use cases. And make sure we are talking about the same ones. I am not

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 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 >> --- >> cache.h | 2 ++ >> wrapper.c | 31 +++ >> 2 files changed, 33 insertions(+) >> >> diff --git a/cache.h b

Re: [PATCH] git-bisect.sh: fix a few style issues

2014-03-03 Thread Junio C Hamano
Jacopo Notarstefano writes: > Redirection operators should have a space before them, but not after them. > > Signed-off-by: Jacopo Notarstefano > --- Looks obviously harmless ;-) Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vge

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

2014-03-03 Thread Duy Nguyen
On Tue, Mar 4, 2014 at 3:28 AM, Eric Sunshine wrote: > On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy > 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 edi

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

2014-03-03 Thread Duy Nguyen
On Tue, Mar 04, 2014 at 01:09:39AM +0100, David Kastrup wrote: > Duy Nguyen writes: > > > On Tue, Mar 4, 2014 at 5:43 AM, Junio C Hamano wrote: > >> diff --git a/git-compat-util.h b/git-compat-util.h > >> index cbd86c3..68ffaef 100644 > >> --- a/git-compat-util.h > >> +++ b/git-compat-util.h > >

Re: [BUG] Halt during fetch on MacOS

2014-03-03 Thread Conley Owens
On Fri, Feb 28, 2014 at 10:15 PM, Jeff King wrote: > On Fri, Feb 28, 2014 at 03:26:28PM -0800, Conley Owens wrote: > >> test.sh >> " >> #!/bin/bash >> rungit() { >> mkdir $1 >> GIT_DIR=$1 git init --bare >> echo '[remote "aosp"]' > $1/config >> e

[PATCH] git-bisect.sh: fix a few style issues

2014-03-03 Thread Jacopo Notarstefano
Redirection operators should have a space before them, but not after them. Signed-off-by: Jacopo Notarstefano --- git-bisect.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index 73b4c14..af4d04c 100755 --- a/git-bisect.sh +++ b/git-bi

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

2014-03-03 Thread David Kastrup
Duy Nguyen writes: > On Tue, Mar 4, 2014 at 5:43 AM, Junio C Hamano wrote: >> diff --git a/git-compat-util.h b/git-compat-util.h >> index cbd86c3..68ffaef 100644 >> --- a/git-compat-util.h >> +++ b/git-compat-util.h >> @@ -357,8 +357,14 @@ extern int suffixcmp(const char *str, const char >> *su

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

2014-03-03 Thread Junio C Hamano
Ilya Bobyr writes: > It might be that we are looking at different use cases, as you are > talking about whole test suits. I do not think so. I do not see anything prevents you from saying GIT_SKIP_TESTS='t !t.1 !t.4' to specify test-pieces in individual tests so that you c

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

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 3:18 PM, Eric Sunshine wrote: On Mon, Mar 3, 2014 at 6:12 PM, Ilya Bobyr wrote: On 3/3/2014 2:59 PM, Eric Sunshine wrote: On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr wrote: We used to show "(missing )" next to tests skipped because they are specified in GIT_SKIP_TESTS. Use "(matc

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 3:26 PM, Junio C Hamano wrote: Eric Sunshine writes: On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr 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? I actually do not like th

Re: [PATCH V2] commit.c: Use skip_prefix() instead of starts_with()

2014-03-03 Thread Junio C Hamano
Max Horn writes: > On 03.03.2014, at 20:43, Junio C Hamano wrote: > >> Tanay Abhra writes: >> >>> @@ -1193,9 +1194,9 @@ static void parse_gpg_output(struct signature_check >>> *sigc) >>> for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { >>> const char *found, *next; >>>

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

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > That new message in patch #2 says "not in GIT_TEST_ONLY", but isn't > "(excluded)" also applicable to that case? Is it important to be able > to distinguish between the two "excluded" reasons? An obvious solution is not to *have* two reasons in the first place ;-) -- To u

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

2014-03-03 Thread Duy Nguyen
On Tue, Mar 4, 2014 at 5:43 AM, Junio C Hamano wrote: > diff --git a/git-compat-util.h b/git-compat-util.h > index cbd86c3..68ffaef 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -357,8 +357,14 @@ extern int suffixcmp(const char *str, const char > *suffix); > > static inline con

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

2014-03-03 Thread Junio C Hamano
David Kastrup writes: > How about a function body of > > do { > if (!*prefix) > return str; > } while (*str++ == *prefix++); > return NULL; > > I'm not too fond of while (1) and tend to use for (;;) instead, but that > may again partly be

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

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr 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? I actually do not like the interface to use two variables very m

RE: difftool sends malformed path to exernal tool on Windows

2014-03-03 Thread Paul Lotz
David, OK, I did as you suggested, and the results were revealing. First, I replaced "echo" with "cat". Result: The contents of both files appeared in the Git Bash Window. Then I tried calling LVCompare from the Git Bash and Windows Command Prompt windows with variations on the paths. Here a

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

2014-03-03 Thread David Kastrup
Junio C Hamano writes: > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -357,8 +357,14 @@ extern int suffixcmp(const char *str, const char > *suffix); > > static inline const char *skip_prefix(const char *str, const char *prefix) > { > - size_t len = strlen(prefix); > - retur

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 6:12 PM, Ilya Bobyr wrote: > On 3/3/2014 2:59 PM, Eric Sunshine wrote: >> >> On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr wrote: >>> >>> We used to show "(missing )" next to tests skipped because they are >>> specified in GIT_SKIP_TESTS. Use "(matched by GIT_SKIP_TESTS)" ins

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 3:03 PM, Eric Sunshine wrote: On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr 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? There is actually an upside in the fact that the n

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

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr 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)"? So

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 2:59 PM, Eric Sunshine wrote: On Mon, Mar 3, 2014 at 5:24 AM, Ilya Bobyr 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 "(exclu

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

2014-03-03 Thread Ilya Bobyr
On 3/3/2014 7:11 AM, Philip Oakley wrote: From: "Ilya Bobyr" We used to show "(missing )" next to tests skipped because they are specified in GIT_SKIP_TESTS. Use "(matched by GIT_SKIP_TESTS)" instead. The message below forgets the "by". I'll fix the commit message. I think the output is l

Re: [PATCH v4 00/14] Use ALLOC_GROW() instead of inline code

2014-03-03 Thread Junio C Hamano
> Dmitry S. Dolzhenko (14): > 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

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 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 > 2 files chan

Re: [PATCH V2] commit.c: Use skip_prefix() instead of starts_with()

2014-03-03 Thread Max Horn
On 03.03.2014, at 20:43, Junio C Hamano wrote: > Tanay Abhra writes: > >> @@ -1193,9 +1194,9 @@ static void parse_gpg_output(struct signature_check >> *sigc) >> for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { >> const char *found, *next; >> >> -if (start

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 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 | 13 +++

Re: [BUG] Halt during fetch on MacOS

2014-03-03 Thread Conley Owens
On Sun, Mar 2, 2014 at 6:36 AM, Max Horn wrote: > > On 01.03.2014, at 00:26, Conley Owens 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 thi

Re: [PATCH v4 05/14] diff.c: use ALLOC_GROW()

2014-03-03 Thread Junio C Hamano
"Dmitry S. Dolzhenko" writes: > Use ALLOC_GROW() instead inline code in > diffstat_add() and diff_q() "...instead of open coding it in..." may read better. > > Signed-off-by: Dmitry S. Dolzhenko > --- > diff.c | 12 ++-- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --gi

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

2014-03-03 Thread Junio C Hamano
Junio C Hamano writes: > Siddharth Goel writes: > >> Helped-by: Eric Sunshine >> Signed-off-by: Siddharth Goel >> --- >> 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 > > Wh

[PATCH v4 12/14] builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

2014-03-03 Thread Dmitry S. Dolzhenko
Helped-by: He Sun Signed-off-by: Dmitry S. Dolzhenko --- builtin/mktree.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builtin/mktree.c b/builtin/mktree.c index f92ba40..a964d6b 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -23,10 +23,7 @@ static void append_

[PATCH v4 09/14] reflog-walk.c: use ALLOC_GROW()

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

Re: [GSoC14][RFC] Proposal Draft: Refactor tempfile handling

2014-03-03 Thread Jeff King
On Sun, Mar 02, 2014 at 06:04:39AM +0900, Brian Gesiak wrote: > My name is Brian Gesiak. I'm a research student at the University of > Tokyo, and I'm hoping to participate in this year's Google Summer of > Code by contributing to Git. I'm a longtime user, first-time > contributor--some of you may

Re: My advice for GSoC applicants

2014-03-03 Thread Junio C Hamano
Michael Haggerty writes: > Based on my experience so far as a first-time Google Summer of Code > mentor, I just wrote a blog article containing some hopefully useful > advice for students applying to the program. Please note that this is > my personal opinion only and doesn't necessarily reflect

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

2014-03-03 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Michael Haggerty writes: >> >>> Or perhaps "-NUM" should fail with an error message if any of the last >>> NUM commits are merges. In that restricted scenario (which probably >>> accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM"

[PATCH v4 04/14] commit.c: use ALLOC_GROW() in register_commit_graft()

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 commit_graft *graft, int ignore_dups)

[PATCH v4 13/14] read-cache.c: use ALLOC_GROW() in add_index_entry()

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- read-cache.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/read-cache.c b/read-cache.c index fb440b4..cbdf954 100644 --- a/read-cache.c +++ b/read-cache.c @@ -990,11 +990,7 @@ int add_index_entry(struct index_state *istate, struct

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

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 *add_commit(struct commit *commit,

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

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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, a = parse_attr_line(lin

[PATCH v4 06/14] diffcore-rename.c: use ALLOC_GROW()

2014-03-03 Thread Dmitry S. Dolzhenko
Use ALLOC_GROW() instead inline code in locate_rename_dst() and register_rename_src() Signed-off-by: Dmitry S. Dolzhenko --- diffcore-rename.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 9b4f068..fbf3272 100644 ---

[PATCH v4 05/14] diff.c: use ALLOC_GROW()

2014-03-03 Thread Dmitry S. Dolzhenko
Use ALLOC_GROW() instead inline code in diffstat_add() and diff_q() Signed-off-by: Dmitry S. Dolzhenko --- 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 @@ -1361,11 +1361,7 @@ stati

[PATCH v4 02/14] bundle.c: use ALLOC_GROW() in add_to_ref_list()

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 bundle\n"; static void add_

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

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 +++ b/builtin/pack-objects.c @@ -1213,12 +1213,9 @@

[PATCH v4 14/14] sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

2014-03-03 Thread Dmitry S. Dolzhenko
Helped-by: He Sun Signed-off-by: Dmitry S. Dolzhenko --- sha1_file.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 019628a..3cb17b8 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2624,12 +2624,7 @@ int pretend_sha1_file(void *buf, unsig

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

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 *find_subtree(struct cache_t

[PATCH v4 10/14] dir.c: use ALLOC_GROW() in create_simplify()

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 **pathspec) for (nr =

[PATCH v4 08/14] replace_object.c: use ALLOC_GROW() in register_replace_object()

2014-03-03 Thread Dmitry S. Dolzhenko
Signed-off-by: Dmitry S. Dolzhenko --- 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 int register_replace_object

[PATCH v4 00/14] Use ALLOC_GROW() instead of inline code

2014-03-03 Thread Dmitry S. Dolzhenko
This version differs from previous [1] the following changes: - added three new commits with similar changes in "builtin/mktree.c", "cache-tree.c" and "sha1_file.c". - updated commit messages: "use ALLOC_GROW() in function_name()" instead of "change function_name() to use ALLOC_GROW()"

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 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 directory. > But when I ran the

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

2014-03-03 Thread Junio C Hamano
Matthieu Moy writes: > Michael Haggerty writes: > >> Or perhaps "-NUM" should fail with an error message if any of the last >> NUM commits are merges. In that restricted scenario (which probably >> accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". > > Makes sense to me. So, -NUM

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

2014-03-03 Thread Junio C Hamano
Michael Haggerty writes: > This might be a reason that "-NUM" is a bad idea. > > Or perhaps "-NUM" should fail with an error message if any of the last > NUM commits are merges. In that restricted scenario (which probably > accounts for 99% of rebases), "-NUM" is equivalent to "HEAD~NUM". That

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 wrote: > Eric Sunshine writes: >> On Mon, Mar 3, 2014 at 1:31 PM, Junio C Hamano wrote: >>> Eric Sunshine writes: It's not obvious from the patch fragment, but 'heads' is not a strbuf, so Faiz correctly left this invocation alone. >>> >>>

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

2014-03-03 Thread saikrishna.sripada
Hi , 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 directory. But when I ran the tests[make in t/ directory] my tests are failing saying " fre

Re: [PATCH v2] git-config: document interactive.singlekey requires Term::ReadKey

2014-03-03 Thread Simon Ruderich
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 --- On Mon, Mar 03, 2014 at 10:58:58AM -0800, Junio C Hamano wrote: > Thanks, but is it true that interactive.singlekey "requries" > Term::ReadKey?

[PATCH] git-add--interactive: warn if module for interactive.singlekey is missing

2014-03-03 Thread Simon Ruderich
Suggested-by: Junio C Hamano Signed-off-by: Simon Ruderich --- git-add--interactive.perl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 24bb1ab..d3bca12 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Mar 3, 2014 at 1:31 PM, Junio C Hamano wrote: >> Eric Sunshine writes: >> >>> On Sat, Mar 1, 2014 at 7:51 AM, He Sun wrote: 2014-03-01 19:21 GMT+08:00 Faiz Kothari : > diff --git a/remote-curl.c b/remote-curl.c > index 10cb011..dee8716 100644 >

Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-03 Thread Henri GEIST
Le lundi 03 mars 2014 à 17:45 +, Jens Lehmann a écrit : > Am 03.03.2014 14:47, schrieb Henri GEIST: > > This new option prevent git submodule to clone the missing > > submodules with the --separate-git-dir option. > > Then the submodule will be regular repository and their gitdir will not > >

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 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 only si

Re: RFC GSoC idea: new "git config" features

2014-03-03 Thread Junio C Hamano
Jeff King writes: > Most callbacks would convert to a query system in a pretty > straightforward way, but some that have side effects might be tricky. > Converting them all may be too large for a GSoC project, but I think you > could do it gradually: > > 1. Convert the parser to read into an in

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-03-03 Thread Jeff King
On Mon, Mar 03, 2014 at 11:51:06AM -0800, Junio C Hamano wrote: > > Yes. Do you need a re-roll from me? I think the last version I sent + > > the squash to tie the default to bitmap-writing makes the most sense. > > I have 9e20b390 (repack: add `repack.packKeptObjects` config var, > 2014-02-26);

Re: [PATCH 2/2] branch: use skip_prefix

2014-03-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Feb 28, 2014 at 12:04:19PM +0900, Brian Gesiak wrote: > >> From: modocache > > Both your emailed patches have this, which is due to your author name > not matching your sending identity. You probably want to set user.name, > or if you already have (which it looks like

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 wrote: > Michael Haggerty 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 help? Perhaps there

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread David Kastrup
Eric Sunshine writes: > As a potential GSoC student and newcomer to the project, Faiz would > not have known that this would be considered unwanted churn when he > chose the task from the GSoC microproject page [1]. Perhaps it would > be a good idea to retire this item from the list? > > On the o

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-03-03 Thread Junio C Hamano
Jeff King writes: > On Mon, Mar 03, 2014 at 10:13:47AM -0800, Junio C Hamano wrote: > >> > Or the flip side: if the user wants to use .keep, we should drop >> > bitmaps. My point is that we do not know which way the user wants to >> > go, so we should not tie the options together. >> >> Hmph. I

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 wrote: > Eric Sunshine writes: > >> On Sat, Mar 1, 2014 at 7:51 AM, He Sun wrote: >>> 2014-03-01 19:21 GMT+08:00 Faiz Kothari : diff --git a/remote-curl.c b/remote-curl.c index 10cb011..dee8716 100644 --- a/remote-curl.c +++ b/re

Re: [PATCH V2] commit.c: Use skip_prefix() instead of starts_with()

2014-03-03 Thread Junio C Hamano
Tanay Abhra writes: > In record_author_date() & parse_gpg_output() ,using skip_prefix() instead of > starts_with() is more elegant and abstracts away the details. Avoid subjective judgement like "more elegant" when justifying your change; you are not your own judge. The caller of starts_with()

Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-03 Thread Junio C Hamano
[CC'ing the submodule area experts.] Henri GEIST writes: > This new option prevent git submodule to clone the missing > submodules with the --separate-git-dir option. > Then the submodule will be regular repository and their gitdir will not > be placed in the superproject gitdir/modules directo

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-03-03 Thread Shawn Pearce
On Fri, Feb 28, 2014 at 10:05 PM, Jeff King wrote: > On Fri, Feb 28, 2014 at 10:09:08AM -0700, Nasser Grainawi wrote: > >> > Exactly. The two features (bitmaps and .keep) are not compatible with >> > each other, so you have to prioritize one. If you are using static .keep >> > files, you might wan

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

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > On Mon, Mar 3, 2014 at 2:18 AM, Dmitry S. Dolzhenko > 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() >> co

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

2014-03-03 Thread Junio C Hamano
Siddharth Goel writes: > Helped-by: Eric Sunshine > Signed-off-by: Siddharth Goel > --- > 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 Whenever you see "Change", "Rewrite", et

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

2014-03-03 Thread Junio C Hamano
Simon Ruderich writes: > 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 Thanks, but is it true that interactive.singlekey "requries" Term::ReadKey? The relevant part of git-add--interact

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

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: >> diff --git a/branch.c b/branch.c >> index 723a36b..ca4e824 100644 >> --- a/branch.c >> +++ b/branch.c >> @@ -50,7 +50,7 @@ static int should_setup_rebase(const char *origin) >> void install_branch_config(int flag, const char *local, const char *origin, >> const char *re

Fwd: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Faiz Kothari
On Tue, Mar 4, 2014 at 12:01 AM, Junio C Hamano wrote: > Eric Sunshine writes: > >> On Sat, Mar 1, 2014 at 7:51 AM, He Sun wrote: >>> 2014-03-01 19:21 GMT+08:00 Faiz Kothari : diff --git a/remote-curl.c b/remote-curl.c index 10cb011..dee8716 100644 --- a/remote-curl.c +++ b/r

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

2014-03-03 Thread Junio C Hamano
Sun He writes: > '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 > --- > > Changing the subject and adding valid information as tutored by > Eric Sunshine. > Thanks to him. > > builtin/pack-objects

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

2014-03-03 Thread Junio C Hamano
Michael Haggerty 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 help? Perhaps there is some way to take advantage of the > difference between start

Rewriting git history during git-svn conversion

2014-03-03 Thread Robert Dailey
Hi, I am converting my team's SVN server to GIT but they aren't ready to transition yet. People are still working out of SVN, so I need to keep the git-svn clone around to do 'git svn fetch' to continue to keep it synchronized with SVN. Once everyone is ready to switch, and after converting all o

Re: An idea for "git bisect" and a GSoC enquiry

2014-03-03 Thread Junio C Hamano
Jacopo Notarstefano writes: > Here my proposal differs in that I have no way of knowing which label > is good and which label is bad: I blindly accept two distinct labels > and bisect with those. I gave an example of this behaviour above. I think you fundamentally cannot use two labels that are

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Junio C Hamano
Eric Sunshine writes: > On Sat, Mar 1, 2014 at 7:51 AM, He Sun wrote: >> 2014-03-01 19:21 GMT+08:00 Faiz Kothari : >>> 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(struc

Re: [PATCH] implemented strbuf_write_or_die()

2014-03-03 Thread Junio C Hamano
Faiz Kothari writes: > Signed-off-by: Faiz Kothari > --- > Implemented write_or_die.c:strbuf_write_or_die() and used in relevant places > to substitute write_or_die(). I spotted other places where strbuf can be used > in place of buf[MAX_PATH] but that would require a change in prototype of a >

Re: [PATCH v2 01/11] builtin/pack-objects.c: change check_pbase_path() to use ALLOC_GROW()

2014-03-03 Thread Junio C Hamano
Jeff King writes: > I realize that I just bikeshedded on subject lines for half a page, and > part of me wants to go kill myself in shame. But I feel like I see the > technique misapplied often enough that maybe some guidance is merited. Thanks. What I queued read like these: $ git shortlog ..

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

2014-03-03 Thread Junio C Hamano
Michael Haggerty writes: > On 02/28/2014 10:29 AM, Dmitry S. Dolzhenko wrote: >> Thank you for your remarks. In this patch I tried to take them into account. >> >> Dmitry S. Dolzhenko (11): >> builtin/pack-objects.c: change check_pbase_path() to use ALLOC_GROW() >> bundle.c: change add_to_re

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-03-03 Thread Jeff King
On Mon, Mar 03, 2014 at 10:13:47AM -0800, Junio C Hamano wrote: > > Or the flip side: if the user wants to use .keep, we should drop > > bitmaps. My point is that we do not know which way the user wants to > > go, so we should not tie the options together. > > Hmph. I think the short of your lat

Re: [PATCH] repack: add `repack.honorpackkeep` config var

2014-03-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Feb 28, 2014 at 10:45:39AM -0800, Junio C Hamano wrote: > >> > Exactly. The two features (bitmaps and .keep) are not compatible with >> > each other, so you have to prioritize one. If you are using static .keep >> > files, you might want them to continue being respecte

Re: [PATCH v3 07/25] reflog: avoid constructing .lock path with git_path

2014-03-03 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Feb 26, 2014 at 5:44 AM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> git_path() soon understands the path given to it. Some paths "abc" may >>> become "def" while other "ghi" may become "ijk". We don't want >>> git_path() to interfere with .lock pa

Re: Branch Name Case Sensitivity

2014-03-03 Thread Junio C Hamano
Lee Hopkins writes: > I went ahead and took a stab at a solution. My solution is more > aggressive than a warning, I actually prevent the creation of > ambiguous refs. My changes are also in refs.c, which may not be > appropriate, but it seemed like the natural place. > > I have never contributed

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

2014-03-03 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Feb 20, 2014 at 6:26 AM, Junio C Hamano wrote: >> Is there a reason not to do just an equivalent of >> >> #define git_pathdup mkpathdup >> >> and be done with it? Am I missing something? > > They have a subtle difference: mkpathdup() calls cleanup_path() while >

Re: [PATCH] submodule : Add --no-separate-git-dir option to add and update command.

2014-03-03 Thread Jens Lehmann
Am 03.03.2014 14:47, schrieb Henri GEIST: > This new option prevent git submodule to clone the missing > submodules with the --separate-git-dir option. > Then the submodule will be regular repository and their gitdir will not > be placed in the superproject gitdir/modules directory. And what is y

Re: [PATCH] cache_tree_find(): remove redundant check in while condition

2014-03-03 Thread David Kastrup
Michael Haggerty writes: > On 03/03/2014 05:32 PM, David Kastrup wrote: >> [...] >> So perhaps all of that should just be >> >> while (*slash == '/') >> slash++; >> if (!*slash) >> return it; >> > > I just fixed a little thing

Re: My advice for GSoC applicants

2014-03-03 Thread Rick Umali
On Mon, Mar 3, 2014 at 5:45 AM, Michael Haggerty wrote: > My secret tip for GSoC success > > http://softwareswirl.blogspot.com/2014/03/my-secret-tip-for-gsoc-success.html I enjoyed reading that BLOG post. I daresay some of the points you raise are pertinent for any new contributor to any open

Re: [PATCH] cache_tree_find(): remove redundant check in while condition

2014-03-03 Thread Michael Haggerty
On 03/03/2014 05:32 PM, David Kastrup wrote: > [...] > So perhaps all of that should just be > > while (*slash == '/') > slash++; > if (!*slash) > return it; > I just fixed a little thing that caught my eye. You OWNED it.

Re: My advice for GSoC applicants

2014-03-03 Thread Philip Oakley
From: "Michael Haggerty" Cc: "Dmitry Dolzhenko" ; "Sun He" ; "Brian Gesiak" ; "Tanay Abhra" ; "Kyriakos Georgiou" ; "Siddharth Goel" ; "Guanglin Xu" ; "Karthik Nayak" ; "Alberto Corona" ; "Jacopo Notarstefano" Hi, Based on my experience so far as a first-time Google Summer of Code mentor, I j

Re: [PATCH] cache_tree_find(): remove redundant check in while condition

2014-03-03 Thread David Kastrup
Michael Haggerty writes: > Signed-off-by: Michael Haggerty > --- > A trivial little cleanup. > > cache-tree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cache-tree.c b/cache-tree.c > index 0bbec43..7f63c23 100644 > --- a/cache-tree.c > +++ b/cache-tree.c > @@ -565,

[PATCH] cache_tree_find(): remove redundant check in while condition

2014-03-03 Thread Michael Haggerty
Signed-off-by: Michael Haggerty --- A trivial little cleanup. cache-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43..7f63c23 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -565,7 +565,7 @@ static struct cache_tree *cache_tree_

[PATCH V2] commit.c: Use skip_prefix() instead of starts_with()

2014-03-03 Thread Tanay Abhra
In record_author_date() & parse_gpg_output() ,using skip_prefix() instead of starts_with() is more elegant and abstracts away the details. Helped-by: Michael Haggerty Signed-off-by: Tanay Abhra --- Patch V2 Corrected email formatting ,reapplied the implementation according to suggestions.

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

2014-03-03 Thread Philip Oakley
Minor nits. From: "Ilya Bobyr" This is a counterpart to GIT_SKIP_TESTS. Mostly useful when debugging. --- t/README | 15 +++ t/test-lib.sh |8 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/t/README b/t/README index caeeb9d..f939987 100644 --- a/

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

2014-03-03 Thread karthik nayak
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 skip_prefix() Replace starts_with() with skip_prefix() for better reading purposes.

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

2014-03-03 Thread Philip Oakley
From: "Ilya Bobyr" We used to show "(missing )" next to tests skipped because they are specified in GIT_SKIP_TESTS. Use "(matched by GIT_SKIP_TESTS)" instead. The message below forgets the "by". Otherwise looks sensible. --- t/test-lib.sh | 13 - 1 files changed, 8 insertions(

[PATCH v2 2/2] i18n: assure command not corrupted by _() process

2014-03-03 Thread Sandy Carter
Separate message from command examples to avoid translation issues such as a dash being omitted in a translation. Signed-off-by: Sandy Carter --- builtin/branch.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index b4d7716..b30

  1   2   >