[PATCH 2/4] remote-helpers: add extra safety checks

Suggested-by: Roman Ovchinnikov Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 14 ++ contrib/remote-helpers/git-remote-hg | 14 ++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b

[PATCH 4/4] remote-hg: add tests for special filenames

So that we check that UTF-8 and spaces work fine. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 68 +++ 1 file changed, 68 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index

[PATCH] completion: fix completion of certain aliases

oesn't know where it come from. So let's override words[1], so the alias 'p' is override by the actual command, 'push'. Reported-by: Aymeric Beaumet Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 1 + contrib/completion/git-completion.

Re: What's cooking in git.git (Dec 2013, #02; Fri, 6)

On Sat, Dec 7, 2013 at 4:03 AM, Felipe Contreras wrote: > Junio C Hamano wrote: >> * fc/transport-helper-fixes (2013-11-13) 12 commits >> - remote-bzr: support the new 'force' option >> - transport-helper: add support to delete branches >> - fast-export:

[PATCH v8 1/6] transport-helper: mismerge fix

Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano ---

[PATCH v8 0/6] transport-helper: fixes

nt is clearly a refspec as it's used that way extensively through Git. Felipe Contreras (4): transport-helper: mismerge fix transport-helper: don't update refs in dry-run transport-helper: add 'force' to 'export' helpers transport-helper: check for 'forced upd

[PATCH v8 2/6] transport-helper: don't update refs in dry-run

The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index b66c7fd..9558a0d 100644 --- a

[PATCH v8 6/6] remote-bzr: support the new 'force' option

From: Richard Hansen Signed-off-by: Richard Hansen Acked-by: Felipe Contreras Signed-off-by: Junio C Hamano Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 31 ++- contrib/remote-helpers/test-bzr.sh| 22 +- 2

[PATCH v8 4/6] transport-helper: check for 'forced update' message

So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index 60fba99..23af747 100644

[PATCH v8 5/6] test-hg.sh: tests are now expected to pass

From: Richard Hansen Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test

[PATCH v8 3/6] transport-helper: add 'force' to 'export' helpers

Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen Documentation-by: Richard Hansen Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- Documentation/gitremote-helpers.txt | 4 git-remote-testgit.sh | 18

[PATCH 0/7] Trivial patches

Felipe Contreras (7): config: avoid yoda conditions add: avoid yoda conditions abspath: trivial style fix t: trivial whitespace cleanups fetch: add missing documentation sha1_name: cleanup interpret_branch_name() sha1_name: simplify track finding Documentation/git-fetch.txt | 3

[PATCH 6/7] sha1_name: cleanup interpret_branch_name()

The 'upstream' variable doesn't hold an "upstream", but a branch, so make it clearer. Signed-off-by: Felipe Contreras --- sha1_name.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index e9c2999..e27db88

[PATCH 1/7] config: avoid yoda conditions

Signed-off-by: Felipe Contreras --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index e1d66a1..7a44414 100644 --- a/config.c +++ b/config.c @@ -610,7 +610,7 @@ static int git_config_maybe_bool_text(const char *name, const char *value

[PATCH 3/7] abspath: trivial style fix

Signed-off-by: Felipe Contreras --- abspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abspath.c b/abspath.c index e390994..8b3385a 100644 --- a/abspath.c +++ b/abspath.c @@ -143,7 +143,7 @@ static const char *real_path_internal(const char *path, int die_on_error

[PATCH 2/7] add: avoid yoda conditions

Signed-off-by: Felipe Contreras --- builtin/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/add.c b/builtin/add.c index 226f758..9b30356 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -429,7 +429,7 @@ int cmd_add(int argc, const char **argv, const char

[PATCH 7/7] sha1_name: simplify track finding

It's more efficient to check for the braces first, and we already have the length of the whole thing. Signed-off-by: Felipe Contreras --- sha1_name.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index e27db88..1a68103 100644

[PATCH 5/7] fetch: add missing documentation

There's no mention of the 'origin' default, or the fact that the upstream tracking branch remote is used. Signed-off-by: Felipe Contreras --- Documentation/git-fetch.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-fetch.txt b/Documentation/git-

[PATCH 4/7] t: trivial whitespace cleanups

Signed-off-by: Felipe Contreras --- t/t0002-gitfile.sh| 3 +-- t/t0003-attributes.sh | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index cb14425..37e9396 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -7,7 +7,7

[PATCH 0/8] remote-{hg,bzr}: updates

Felipe Contreras (8): remote-bzr: fix export of utf-8 authors remote-bzr: make bzr branches configurable per-repo remote-hg: fix test remote-hg: add missing &&s in the test remote-hg: improve basic test remote-helpers: trivial style fixes remote-helpers: cleanup more global v

[PATCH 2/8] remote-bzr: make bzr branches configurable per-repo

Different repositories have different branches, some are are even branches themselves. Reported-by: Peter Niederlag Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/contrib/remote

[PATCH 3/8] remote-hg: fix test

It wasn't being checked properly before; those refs never existed. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index f7ce8aa..cbf8617 1

[PATCH 4/8] remote-hg: add missing &&s in the test

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index cbf8617..94b0bba 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib

[PATCH 6/8] remote-helpers: trivial style fixes

In accordance with pep8. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- contrib/remote-helpers/git-remote-hg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote

[PATCH 5/8] remote-hg: improve basic test

It appears 'let' is not present in all shells. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 94b0bba..5a6f745 10

[PATCH 8/8] remote-hg: support for notes

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 33 - 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 307d82c..0dbda75 100755 --- a/contrib

[PATCH 7/8] remote-helpers: cleanup more global variables

They don't need to be specified if they are not going to be set. Suggested-by: Dusty Phillips Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 29 - contrib/remote-helpers/git-remote-hg | 30 ++ 2 files ch

[PATCH 1/8] remote-bzr: fix export of utf-8 authors

Reported-by: Joakim Verona Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 1 + contrib/remote-helpers/test-bzr.sh| 30 ++ 2 files changed, 31 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers

Re: [PATCH 1/8] remote-bzr: fix export of utf-8 authors

On Wed, Aug 28, 2013 at 3:05 PM, Matthieu Moy wrote: > Felipe Contreras writes: > >> + echo greg >> content && >> + git add content && >> + git commit -m one > > test_commit would make it shorter. And it would make it inconsi

[PATCH v2] remote-bzr: fix export of utf-8 authors

Reported-by: Joakim Verona Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 1 + contrib/remote-helpers/test-bzr.sh| 30 ++ 2 files changed, 31 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers

Re: [PATCH 1/8] remote-bzr: fix export of utf-8 authors

On Wed, Aug 28, 2013 at 3:54 PM, Antoine Pelisse wrote: > On Wed, Aug 28, 2013 at 10:48 PM, Felipe Contreras > wrote: >> On Wed, Aug 28, 2013 at 3:05 PM, Matthieu Moy >> wrote: >>> Felipe Contreras writes: >>> >>>> + echo greg >> c

Re: [PATCH 1/8] remote-bzr: fix export of utf-8 authors

On Wed, Aug 28, 2013 at 4:05 PM, Matthieu Moy wrote: > Felipe Contreras writes: > >> On Wed, Aug 28, 2013 at 3:05 PM, Matthieu Moy >> wrote: >> >>>> + bzr log | grep "^committer: " > ../actual >>>> + ) && >>>

Re: [PATCH 1/8] remote-bzr: fix export of utf-8 authors

On Wed, Aug 28, 2013 at 4:21 PM, Felipe Contreras wrote: > On Wed, Aug 28, 2013 at 3:54 PM, Antoine Pelisse wrote: >> On Wed, Aug 28, 2013 at 10:48 PM, Felipe Contreras >> wrote: >>> On Wed, Aug 28, 2013 at 3:05 PM, Matthieu Moy >>> wrote: >>>> Fe

Re: [PATCH 1/8] remote-bzr: fix export of utf-8 authors

On Wed, Aug 28, 2013 at 4:58 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Felipe Contreras writes: >> >>> On Wed, Aug 28, 2013 at 3:05 PM, Matthieu Moy >>> wrote: >>> >>>>> + bzr log | grep "^committer: " >

Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull

ps a follow-up patch to be squashed? I do. Whether the user does 'git pull' or 'git pull origin' doesn't matter, we still want to reject non-fast-forward merges. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 2/9] transport-helper: check for 'forced update' message

So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index 62051a6..95dd72e 100644 --- a/transport-helper.c +++ b

[PATCH 3/9] fast-export: improve argument parsing

We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 8e19058..91114f4 100644 --- a/bu

[PATCH 0/9] transport-helper: updates

anybody is interested. Felipe Contreras (9): transport-helper: add 'force' to 'export' helpers transport-helper: check for 'forced update' message fast-export: improve argument parsing fast-export: add new --refspec option transport-helper: add support for

[PATCH 1/9] transport-helper: add 'force' to 'export' helpers

Otherwise they cannot know when to force the push or not (other than hacks). Signed-off-by: Felipe Contreras --- transport-helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/transport-helper.c b/transport-helper.c index 63cabc3..62051a6 100644 --- a/transport-helper.c +++ b

[PATCH 4/9] fast-export: add new --refspec option

So that we can covert the exported ref names. Signed-off-by: Felipe Contreras --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 30 ++ t/t9350-fast-export.sh| 7 +++ 3 files changed, 41 insertions(+) diff --git a

[PATCH 6/9] fast-import: add support to delete refs

Signed-off-by: Felipe Contreras --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b

[PATCH 5/9] transport-helper: add support for old:new refspec

By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 8c

[PATCH 8/9] transport-helper: add support to delete branches

For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helper

[PATCH 9/9] transport-helper: don't update refs in dry-run

The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index 5490796..9bbf209 100644 --- a/transport-helper.c +++ b/transport

[PATCH 7/9] fast-export: add support to delete refs

Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++ 2 files changed, 25 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 7f314f0..9b728ca 100644 --- a/builtin/fast-export.c +++ b/builtin/fast

Officially start moving to the term 'staging area'

C C C It might be possible to do 'git reset --no-stage --work', to reset the working directory, but leave the staging area alone. For more reference about the previous discussions: http://thread.gmane.org/gmane.comp.version-control.git/197111 http://thread.gmane.org/gmane.comp.ve

[PATCH 2/2] stage: add edit command

Signed-off-by: Felipe Contreras --- Documentation/git-stage.txt| 5 +++ builtin/stage.c| 74 ++ contrib/completion/git-completion.bash | 4 +- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/Documentation/git

[PATCH 0/2] stage: proper 'stage' command

Hi, The first patch adds subcommands for the 'git stage' command; add, reset, diff, rm, apply. By default the add command is used, so 'git stage $file' remains the same. The second patch adds the incredibly useful 'git stage edit' command. Felipe Contreras (2)

[PATCH 1/2] Add proper 'stage' command

Signed-off-by: Felipe Contreras --- Documentation/git-stage.txt| 45 + Makefile | 2 +- builtin.h | 1 + builtin/stage.c| 52 ++ contrib

[PATCH 0/9] Add --stage and --work options

Hi, Some commands (git diff) already have the --staged alias, this patch series document them, and do the same for the rest. Also, add a --work (and --no-work) option, so that in addition to --stage, we can replace --cached in 'git apply'. The old options remain unchanged. Felipe Co

[PATCH 1/9] diff: document --staged

Synonym for --cached. Signed-off-by: Felipe Contreras --- Documentation/git-diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 78d6d50..646e5cd 100644 --- a/Documentation/git-diff.txt +++ b/Documentation

[PATCH 2/9] grep: add --staged option

Synonym for --cached. Signed-off-by: Felipe Contreras --- Documentation/git-grep.txt | 5 - builtin/grep.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 8497aa4..9f7899c 100644 --- a

[PATCH 3/9] rm: add --staged option

Synonym for --cached. Signed-off-by: Felipe Contreras --- Documentation/git-rm.txt | 5 - builtin/rm.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index 1d876c2..156b40d 100644 --- a/Documentation/git

[PATCH 4/9] stash: add --stage option to save

--no-stage is synonym for --keep-index. Signed-off-by: Felipe Contreras --- Documentation/git-stash.txt | 6 +++--- git-stash.sh| 8 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index db7e803

[PATCH 6/9] submodule: add --staged options

Synonym for --cached. Signed-off-by: Felipe Contreras --- Documentation/git-submodule.txt | 8 ++-- git-submodule.sh| 10 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index

[PATCH 5/9] stash: add --stage to pop and apply

Synonym of --index. Signed-off-by: Felipe Contreras --- Documentation/git-stash.txt | 8 git-stash.sh| 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 75b4cc6..b4066fd 100644 --- a

[PATCH 7/9] apply: add --stage option

Synonym for --index. Signed-off-by: Felipe Contreras --- Documentation/git-apply.txt | 5 - builtin/apply.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index f605327..ce44327 100644 --- a

[PATCH 9/9] completion: update --staged options

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 5da920e..4adc4ed 100644 --- a/contrib/completion/git

[PATCH 8/9] apply: add --work, --no-work options

dify, or not, the working directory. So, --work (the default), doesn't cause any changes, and --no-work enables the current --cache if used with --index. Eventually --work might replace --cache, if these options are standarized in the whole git toolset. Signed-off-by: Felipe Contrer

[PATCH 1/3] reset: add --stage and --work options

Signed-off-by: Felipe Contreras --- Documentation/git-reset.txt | 8 builtin/reset.c | 20 2 files changed, 28 insertions(+) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index f445cb3..5cd75a8 100644 --- a/Documentation/git

[PATCH 0/3] reset: refactor into --stage and --work

Hi, This patch series is not really necessary for the whole --stage series, but it makes sense while we are at it. Felipe Contreras (3): reset: add --stage and --work options reset: allow --keep with --stage completion: update 'git reset' new stage options Documentation/git

[PATCH 2/3] reset: allow --keep with --stage

Signed-off-by: Felipe Contreras --- Documentation/git-reset.txt | 2 +- builtin/reset.c | 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 5cd75a8..a1419c9 100644 --- a/Documentation/git

[PATCH 3/3] completion: update 'git reset' new stage options

Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4adc4ed..24b2c22 100644 --- a/contrib/completion/git

Re: [PATCH 2/2] stage: add edit command

Matthieu Moy wrote: > Felipe Contreras writes: > > > +'edit':: > > + > > +Manually edit the staging area (as a diff). > > + > > That sounds interesting. It reminds me "git add --edit", but they are > different ('stage edit

Re: [PATCH 1/2] Add proper 'stage' command

Matthieu Moy wrote: > Felipe Contreras writes: > > > +COMMANDS > > + > > + > > +With no arguments, it's a synonym for linkgit:git-add[1]. > > This would not be very useful since "git add" errors out when called > without arguments

Re: Officially start moving to the term 'staging area'

Matthieu Moy wrote: > Felipe Contreras writes: > > > It has been discussed many times in the past that 'index' is not an > > appropriate description for what the high-level user does with it, and > > it has been agreed that 'staging area' is the be

Re: [PATCH 2/4] transport-helper: add dont-update-private capability

On Thu, Aug 29, 2013 at 1:58 PM, Matthieu Moy wrote: > Since 664059fb62 (Felipe Contreras, Apr 17 2013, transport-helper: update > remote helper namespace), a 'push' operation on a remote helper updates > the private ref by default. This is often a good thing, but it can als

Re: [PATCH 0/9] transport-helper: updates

On Thu, Aug 29, 2013 at 2:22 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Some of these were were sent before and rejected without a >> reason,... > > Earlier, you were asked to leave because many constructive criticism > or suggestion for improvement to

Re: Officially start moving to the term 'staging area'

On Thu, Aug 29, 2013 at 1:37 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> It has been discussed many times in the past that 'index' is not an >> appropriate description for what the high-level user does with it, and >> it has been agreed th

Re: Officially start moving to the term 'staging area'

On Thu, Aug 29, 2013 at 3:03 PM, René Scharfe wrote: > Am 29.08.2013 20:57, schrieb Felipe Contreras: >> >> Matthieu Moy wrote: >> >>> Felipe Contreras writes: >>>> >>>> Moreover, the --stage and --work >>> >>> >

Re: [PATCH 1/2] repack: rewrite the shell script in C

http://article.gmane.org/gmane.comp.version-control.git/147190 Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] remote-hg: support for notes

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 307d82c..e49fcfa 100755 --- a/contrib

Re: Officially start moving to the term 'staging area'

On Thu, Aug 29, 2013 at 4:55 PM, Drew Northup wrote: > On Thu, Aug 29, 2013 at 2:37 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> It has been discussed many times in the past that 'index' is not an >>> appropriate description for what t

[PATCH v3] remote-hg: support for notes

e to be updated when importing (fetching). Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 35 ++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-rem

[PATCH] revision: add --except option

bf7b (test) two * d025ae0 (HEAD, master) one But when using '--branches --not crap' nothing will come out. Signed-off-by: Felipe Contreras --- Documentation/git-rev-parse.txt| 6 ++ contrib/completion/git-completion.bash | 2 +- revision.c |

Re: [PATCH] revision: add --except option

On Fri, Aug 30, 2013 at 12:00 AM, Felipe Contreras wrote: > So that it's possible to remove certain refs from the list without > removing the objects that are referenced by other refs. > > For example this repository: > > * 374e8dd (crap) crap > * 4cbbf7b (tes

[PATCH v6 04/28] revert/cherry-pick: add --skip option

Akin to 'am --skip' and 'rebase --skip'. Signed-off-by: Felipe Contreras --- Documentation/git-cherry-pick.txt | 1 + Documentation/git-revert.txt | 1 + Documentation/sequencer.txt | 3 +++ builtin/revert.c | 6 ++ sequencer.c

[PATCH v6 00/28] Massive improvents to rebase and cherry-pick

Hi, These are improvements to 'git rebase' by using a much improved 'git cherry-pick'. A new rewrite.c helper is added, and builtin/commit updated to use that. A new git-rebase--cherypick mode is added, and it replaces git-rebase--am and git-rebase--merge. Felipe Contreras

[PATCH v6 01/28] cherry-pick: don't barf when there's nothing to do

Signed-off-by: Felipe Contreras --- sequencer.c | 2 +- t/t3510-cherry-pick-sequence.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 351548f..a962b33 100644 --- a/sequencer.c +++ b/sequencer.c @@ -661,7 +661,7

[PATCH v6 02/28] cherry-pick: add --skip-empty option

Pretty much what it says on the tin. Signed-off-by: Felipe Contreras --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 8 sequencer.c | 6 ++ sequencer.h | 1 + t/t3508-cherry-pick-many

[PATCH v6 03/28] revert/cherry-pick: add --quiet option

Signed-off-by: Felipe Contreras --- Documentation/git-cherry-pick.txt | 6 +- Documentation/git-revert.txt | 6 +- builtin/revert.c | 1 + sequencer.c | 11 +++ sequencer.h | 1 + 5 files changed, 19 insertions

[PATCH v6 05/28] builtin: add rewrite helper

So that we can load and store rewrites, as well as other operations on a list of rewritten commits. Signed-off-by: Felipe Contreras --- Makefile | 2 ++ rewrite.c | 71 +++ rewrite.h | 18 3 files changed, 91

[PATCH v6 08/28] builtin: move run_rewrite_hook() to rewrite.c

And use struct rewrite. Signed-off-by: Felipe Contreras --- builtin/commit.c | 38 +- rewrite.c| 32 rewrite.h| 1 + 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/builtin/commit.c b/builtin

[PATCH v6 26/28] rebase: cherry-pick: add merge options

Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index d36b0dc..bda7cfc 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -45,6 +45,15 @@ else

[PATCH v6 15/28] rebase: cherry-pick: fix sequence continuation

We are not in am mode. Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index e142cfb..d8d32fe 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase

[PATCH v6 18/28] rebase: cherry-pick: fix status messages

Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index e9e..be17ec4 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -3,6 +3,9 @@ # Copyright (c

[PATCH v6 28/28] rebase: cherry-pick: add copyright

Probably enough changes to warrant that. Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index bda7cfc..da949aa 100644 --- a/git-rebase--cherrypick.sh +++ b

[PATCH v6 16/28] rebase: cherry-pick: fix abort of cherry mode

Signed-off-by: Felipe Contreras --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index b28addc..db2ea8d 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -368,6 +368,7 @@ skip) run_specific_rebase ;; abort) + test "

[PATCH v6 10/28] cherry-pick: add --action-name option

So it can be used by other tools (e.g. git rebase), and the right action is passed to the hooks and notes rewrite stuff. Signed-off-by: Felipe Contreras --- builtin/revert.c | 2 ++ git-rebase--interactive.sh | 4 ++-- sequencer.c| 6 +- sequencer.h

[PATCH v6 14/28] rebase: cherry-pick: fix mode storage

We don't use the 'rebase-apply'. Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 5 - git-rebase.sh | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 2c16995..e142c

[PATCH v6 19/28] rebase: cherry-pick: automatically commit stage

When there's changes in the staging area. Just like the other rebase modes. Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index be17ec4..241cda7 100644 ---

[PATCH v6 12/28] cherry-pick: remember rerere-autoupdate

Signed-off-by: Felipe Contreras --- sequencer.c | 8 1 file changed, 8 insertions(+) diff --git a/sequencer.c b/sequencer.c index 076bb9d..453e4a4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -847,6 +847,8 @@ static int populate_opts_cb(const char *key, const char *value, void *data

[PATCH v6 07/28] cherry-pick: don't store skipped commit

Signed-off-by: Felipe Contreras --- sequencer.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sequencer.c b/sequencer.c index 468fa54..56d791f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1047,7 +1047,7 @@ static int continue_single_pick(void) return

[PATCH v6 25/28] rebase: use 'cherrypick' mode instead of 'am'

Unless any specific 'git am' options are used. Signed-off-by: Felipe Contreras --- git-rebase.sh | 8 t/t3407-rebase-abort.sh| 2 +- t/t3420-rebase-autostash.sh| 2 +- t/t3425-rebase-topology-merges.sh | 6 +++--

[PATCH v6 20/28] rebase: cherry-pick: set correct action-name

Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 241cda7..d36b0dc 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -45,7 +45,7

[PATCH v6 24/28] prompt: parse cherry-pick rebase mode

Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index a81ef5a..a7bde16 100644 --- a/contrib/completion/git-prompt.sh

[PATCH v6 23/28] sequencer: store progress information

So that it can be used by shell prompts. Signed-off-by: Felipe Contreras --- sequencer.c | 24 ++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index 453e4a4..c855dd4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -21,6 +21,7

[PATCH v6 21/28] rebase: trivial cleanup

Signed-off-by: Felipe Contreras --- git-rebase--am.sh | 1 + git-rebase.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--am.sh b/git-rebase--am.sh index aae6a85..d6a434c 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -51,6 +51,7 @@ ret=0

[PATCH v6 11/28] cherry-pick: copy notes and run hooks

If no action-name is specified, nothing is done. Signed-off-by: Felipe Contreras --- Documentation/config.txt | 9 - Documentation/githooks.txt | 8 rewrite.c | 1 + sequencer.c| 25 - 4 files changed, 33 insertions

[PATCH v6 27/28] rebase: remove merge mode

The cherrypick mode does the job. Signed-off-by: Felipe Contreras --- .gitignore| 1 - Makefile | 1 - git-rebase--interactive.sh| 2 +- git-rebase--merge.sh | 151 -- git-rebase.sh

<    3   4   5   6   7   8   9   10   11   12   >