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

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. Signed-off-by: Henri GEIST --- Documentation/git-submodule.tx

[PATCH v2 1/2] i18n: proposed command missing leading dash

Add missing leading dash to proposed commands in french output when using the command: git branch --set-upstream remotename/branchname and when upstream is gone Signed-off-by: Sandy Carter --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.p

Re: [PATCH] contrib/subtree - unset prefix before proceeding

Hi, Any chance to have this patch considered? Thanks in advance, _g. Gilles Filippini a écrit , Le 01/03/2014 17:33: > This is to prevent unwanted prefix when such an environment variable > exists. The case occurs for example during the Debian package build > where the git-subtree test suite is

Re: Branch Name Case Sensitivity

> I don't think this distinction is necessary, either you have a > case-insensitive file system or you don't. The case > that the .git directory is case-sensitive and the worktree directory isn't > (or the other way around) is > probably so exotic that we can ignore it. I think Torsten's use cas

Re: [PATCH] Use ALLOC_GROW() instead of inline code

2014-02-28 4:45 GMT+08:00 Dmitry S. Dolzhenko : > Signed-off-by: Dmitry S. Dolzhenko > --- > attr.c | 7 +-- > builtin/pack-objects.c | 7 +-- > bundle.c | 6 +- > cache-tree.c | 6 +- > commit.c | 8 ++-- > diff.c

Re: submodules: reuse .git/modules/... for multiple checkouts of same URL

On Mar 3, 2014, at 7:24 AM, wrote: > I have a git superproject with 3 submodules. The submodules are cloned from > the same URL but use different branches. Git clones the repo three times and > I have three entries in .git/modules. Is it possible to reuse the first clone > for the next submodu

submodules: reuse .git/modules/... for multiple checkouts of same URL

Hi, I have a git superproject with 3 submodules. The submodules are cloned from the same URL but use different branches. Git clones the repo three times and I have three entries in .git/modules. Is it possible to reuse the first clone for the next submodule clones? Stefan -- To unsubscribe fro

My advice for GSoC applicants

Hi, 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 the views of the Git/libgit2

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

Duy Nguyen writes: > Logically, yes. Practically, no. If you have to put multiple -e and > some hashes in one line, wouldn't editing to-do list in your favorite > editor be faster? An editor is the last resort when the card puncher is broken. -- David Kastrup -- To unsubscribe from this list:

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

Duy Nguyen writes: > On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy > wrote: >> 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"

[PATCH] rev-parse --parseopt: option argument name hints

Built-in commands can specify names for option arguments, that are shown when usage text is generated for the command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after the argument name up to the first whitespace. Underscores ar

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

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/t/README +++ b/t/README @@ -187,6

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

We used to show "(missing )" next to tests skipped because they are specified in GIT_SKIP_TESTS. Use "(matched by GIT_SKIP_TESTS)" instead. --- t/test-lib.sh | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 1531c24..89a405b 1

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

On Mon, Mar 3, 2014 at 5:10 PM, Michael Haggerty wrote: > On 03/02/2014 10:09 AM, Eric Sunshine wrote: >> On Sun, Mar 2, 2014 at 4:04 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 EDIT

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

On Mon, Mar 03, 2014 at 10:37:11AM +0100, Matthieu Moy wrote: > 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

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

Duy Nguyen writes: > On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy > >> This would actually be a feature for me: I often want to rebase "recent >> enough" history, and when my @{upstream} isn't well positionned, I >> randomly type HEAD~N without remembering what N should be. When N is too >> small

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

On 03/02/2014 10:09 AM, Eric Sunshine wrote: > On Sun, Mar 2, 2014 at 4:04 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^ >>> >

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

On Mon, Mar 3, 2014 at 4:37 PM, Matthieu Moy wrote: > 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". >

Re: Branch Name Case Sensitivity

Am 01.03.2014 07:54, schrieb Torsten Bögershausen: > On 2014-03-01 03.42, Lee Hopkins wrote: >> + >> +if(ignore_case) > Only looking at ignore_case here closes the door for people > who have a branch "foo" and "Foo" at the same time. > (Which means that they are carefully running git pack-refs)

[PATCH v3] 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 Helped-by: Duy Nguyen Signed-off-by: Sun He --- PATCH v3 delete the one

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

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 would actually mean "rebase the

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

2014-03-03 15:41 GMT+08:00 Eric Sunshine : > On Sat, Mar 1, 2014 at 9:29 PM, Sun He wrote: >> Signed-off-by: Sun He >> Helped-by: Eric Sunshine >> Helped-by: Michael Haggerty >> --- >> >> This patch has assumed that you have already fix the bug of >> tmpname in builtin/pack-objects.c:write_pack

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

The old version fixes a maximum length on the buffer, which could be a problem if one is not certain of the length of get_object_directory(). Using strbuf can avoid the protential bug. Helped-by: Michael Haggerty Helped-by: Eric Sunshine Signed-off-by: Sun He --- PATCH v3 adds the reason why w

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

to avoid a magic code of 11. Helped-by: Sun He Helped-by: Eric Sunshine Helped-by: Jacopo Notarstefano Signed-off-by: Guanglin Xu --- This is an implementation of the idea#2 of GSoC 2014 microproject. branch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branch.c

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

On 03/02/2014 04:55 PM, Matthieu Moy wrote: > Eric Sunshine writes: > >> On Sun, Mar 2, 2014 at 3:53 AM, Eric Sunshine >> wrote: >>> On Sat, Mar 1, 2014 at 9:53 PM, Nguyễn Thái Ngọc Duy >>> wrote: This is "rev-list style", where people can do "git rev-list -3" in addition to "git re

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

The format of this email is wrong. The non-commit-message notes should come between the "---" line (<- note, there are three minus signs here) and the patch itself. On 03/01/2014 08:48 PM, Tanay Abhra wrote: > Signed-off-by: Tanay Abhra > --- > commit.c |2 +- > 1 file changed, 1 insertion(

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

Hi Eric, Yes, you're right. "!!" is comfortably concise and also idiomatic in Git sources. Thanks, Guanglin 2014-03-03 16:12 GMT+08:00 Eric Sunshine : > On Mon, Mar 3, 2014 at 1:36 AM, Guanglin Xu wrote: >> to avoid a magic code of 11. >> >> Helped-by: Sun He >> Helped-by: Eric Sunshine >> H

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

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 wrote: > Replace with skip_prefix(), which uses the inbuilt function > strcmp() to compare. Explaining the purpose of the change is indeed importa

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

On Sat, Mar 1, 2014 at 7:12 AM, Nguyễn Thái Ngọc Duy 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 > --- > git-am.sh | 22 +++---

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

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() > commit.c: use ALLOC_GROW() in regis

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

On Mon, Mar 3, 2014 at 1:36 AM, Guanglin Xu wrote: > to avoid a magic code of 11. > > Helped-by: Sun He > Helped-by: Eric Sunshine > Helped-by: Jacopo Notarstefano > > Signed-off-by: Guanglin Xu > --- > > This is an implementation of the idea#2 of GSoC 2014 microproject. > > branch.c | 8

<    1   2