[PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref

Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with BISECT_HEAD. Signed-off-by: David Turner dtur...@twopensource.com --- git-bisect.sh | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index

[PATCH v3 4/7] refs: Break out check for reflog autocreation

This is just for clarity. Signed-off-by: David Turner dtur...@twopensource.com --- refs.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index b34a54a..dff91cf 100644 --- a/refs.c +++ b/refs.c @@ -3118,6 +3118,14 @@ static int copy_msg(char

[PATCH v3 7/7] git-stash: use git-reflog instead of creating files

This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner dtur...@twopensource.com --- git-stash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 8e9e2cd..27155bc 100755 ---

git submodule init --recursive?

I have a few nested submodules, all use relative URLs such as: ../mysubmodule.git ../../tools/tool1.git If I change my parent repo URL, I need to recursively update all remotes in each submodule. There is no `--recursive` option for `git submodule init`. What is the recommend method for

Re: git submodule init --recursive?

On Thu, Jun 25, 2015 at 8:04 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a few nested submodules, all use relative URLs such as: ../mysubmodule.git ../../tools/tool1.git If I change my parent repo URL, I need to recursively update all remotes in each submodule. There is no

Re: [PATCH] Revert stash: require a clean index to apply

Um. I encountered this issue in git 2.4.3 on Fedora 22. These lines appear in /usr/libexec/git-core/git-stash on my Fedora 22 system: git diff-index --cached --quiet --ignore-submodules HEAD -- || die $(gettext Cannot apply stash: Your index contains uncommitted

Re: [PATCH] commit: add commit.signoff config option

On 06/25, cmarc...@gmail.com wrote: From: Caio Marcelo de Oliveira Filho cmarc...@gmail.com In projects that use Signed-off-by, it's convenient to include that line in the commit by default. The commit.signoff config option allows to add that line in all commits automatically. Document

Re: [PATCH] commit: add commit.signoff config option

Caio Marcelo de Oliveira Filho cmarc...@gmail.com writes: +test_expect_success 'commit.signoff config option' ' +git config commit.signoff true +echo yet another content *narf* foo +echo zort | git commit -F - foo +git cat-file commit HEAD | sed 1,/^\$/d

Re: [PATCH v5 01/11] t6301: for-each-ref tests for ref-filter APIs

On Thu, Jun 25, 2015 at 5:46 AM, Junio C Hamano gits...@pobox.com wrote: Karthik Nayak karthik@gmail.com writes: t/t6301-for-each-ref-filter.sh | 19 +++ t6301 is already used in mh/reporting-broken-refs-from-for-each-ref topic. Please renumber. Will do :) Thanks --

[PATCH v6 00/11] add options to for-each-ref

v5 of this patch series can be found here : http://article.gmane.org/gmane.comp.version-control.git/272590 This is a continuation of my GSoC project to unify git tag -l, git branch -l and for-each-ref. Continued from this patch series :

[PATCH v6 05/11] ref-filter: add parse_opt_merge_filter()

Add 'parse_opt_merge_filter()' to parse '--merged' and '--no-merged' options and write macros for the same. This is copied from 'builtin/branch.c' which will eventually be removed when we port 'branch.c' to use ref-filter APIs. Based-on-patch-by: Jeff King p...@peff.net Mentored-by: Christian

[PATCH v6 04/11] for-each-ref: add '--points-at' option

Add the '--points-at' option provided by 'ref-filter'. The option lets the user to pick only refs which point to a particular commit. Add documentation and tests for the same. Based-on-patch-by: Jeff King p...@peff.net Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by:

[PATCH v6 06/11] ref-filter: implement '--merged' and '--no-merged' options

In 'branch -l' we have '--merged' option which only lists refs (branches) merged into the named commit and '--no-merged' option which only lists refs (branches) not merged into the named commit. Implement these two options in ref-filter.{c,h} so that other commands can benefit from this.

Re: [PATCH] commit: add commit.signoff config option

On Thu, Jun 25, 2015 at 9:32 AM, Caio Marcelo de Oliveira Filho cmarc...@gmail.com wrote: In projects that use Signed-off-by, it's convenient to include that line in the commit by default. The commit.signoff config option allows to add that line in all commits automatically. You can use a

[PATCH v6 09/11] parse-options.h: add macros for '--contains' option

Add a macro for using the '--contains' option in parse-options.h also include an optional '--with' option macro which performs the same action as '--contains'. Make tag.c and branch.c use this new macro. Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by: Matthieu Moy

[PATCH v6 10/11] ref-filter: implement '--contains' option

'tag -l' and 'branch -l' have two different ways of finding out if a certain ref contains a commit. Implement both these methods in ref-filter and give the caller of ref-filter API the option to pick which implementation to be used. 'branch -l' uses 'is_descendant_of()' from commit.c which is

[PATCH v6 11/11] for-each-ref: add '--contains' option

Add the '--contains' option provided by 'ref-filter'. The '--contains' option lists only refs which contain the mentioned commit (HEAD if no commit is explicitly given). Add documentation and tests for the same. Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by: Matthieu Moy

[PATCH v6 02/11] tag: libify parse_opt_points_at()

Rename 'parse_opt_points_at()' to 'parse_opt_object_name()' and move it from 'tag.c' to 'parse-options'. This now acts as a common parse_opt function which accepts an objectname and stores it into a sha1_array. Based-on-patch-by: Jeff King p...@peff.net Mentored-by: Christian Couder

[PATCH v6 03/11] ref-filter: implement '--points-at' option

In 'tag -l' we have '--points-at' option which lets users list only tags which point to a particular commit. Implement this option in 'ref-filter.{c,h}' so that other commands can benefit from this. This is duplicated from tag.c, we will eventually remove that when we port tag.c to use ref-filter

[PATCH v6 01/11] t6302: for-each-ref tests for ref-filter APIs

Add a test suite for testing the ref-filter APIs used by for-each-ref. We just intialize the test suite for now. More tests will be added in the following patches as more options are added to for-each-ref. Based-on-patch-by: Jeff King p...@peff.net Mentored-by: Christian Couder

[PATCH v6 08/11] parse-option: rename parse_opt_with_commit()

Rename parse_opt_with_commit() to parse_opt_commits() to show that it can be used to obtain a list of commits and is not constricted to usage of '--contains' option. Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by: Matthieu Moy matthieu@grenoble-inp.fr Signed-off-by:

Re: Dependency Management

On 23/06/15 19:49, Josh Hagins wrote: If neither git-submodule nor git-subtree is palatable to you, here are a couple of alternatives you might try: * https://github.com/ingydotnet/git-subrepo * https://github.com/tdd/git-stree You could also use Android's repo tool:

<    1   2