Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode

On Fri, Oct 11, 2013 at 11:40 PM, Richard Hansen rhan...@bbn.com wrote: On 2013-10-11 22:08, Felipe Contreras wrote: I'm fine with 'echo warning: foo 2', but still, if you really cared about consistency, there would be a warn() function So add one! It's only one simple line: warning()

[PATCH try2 1/2] branch: trivial cleanup

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0836890..ac17b18 100644 --- a/builtin/branch.c +++

[PATCH try2 0/2] branch: improve verbose option

This has been discussed before: http://thread.gmane.org/gmane.comp.version-control.git/224489 but in the spirit of the perfect being the enemy of the good, nothing got done. This series makes 'git branch -v' much faster, and gives us the most important information; the configured upstream

[PATCH try2 2/2] branch: reorganize verbose options

Showing the upstream tracking branch is more important than how many commits are ahead/behind, so now 'git branch -v' shows the upstream, but not the tracking info, and 'git branch -vv' shows all information (as before). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH v4 4/7] pull: add merge-ff-only option

It is very typical for Git newcomers to inadvertently create merges and worst; inadvertently pushing them. This is one of the reasons many experienced users prefer to avoid 'git pull', and recommend newcomers to avoid it as well. To avoid these problems and keep 'git pull' useful, it has been

[PATCH v4 5/7] pull: add warning on non-ff merges

To prepare our uses for the upcoming changes we should warn them and let them know that they will need to specify a merge or a rebase in the future (when a non-fast-forward situation arises). Also, let them know we fallback to 'git pull --merge', so when the obsoletion of this mode comes, they

[PATCH v4 3/7] pull: add --merge option

Also, deprecate --no-rebase since there's no need for it any more. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 8 ++-- git-pull.sh| 6 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git

[PATCH v4 1/7] pull: rename pull.rename to pull.mode

Also 'branch.name.rebase' to 'branch.name.pullmode'. This way 'pull.mode' can be set to 'merge', and the default can be something else. The old configurations still work, but get deprecated. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/config.txt | 22

[PATCH v4 7/7] pull: add documentation about non-ff merges

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 18 ++ 1 file changed, 18 insertions(+) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 6d55737..b4053a8 100644 --- a/Documentation/git-pull.txt +++

[PATCH v4 0/7] Reject non-ff pulls by default

Minor changes since v3. Junio already sent a similar patch, but I think this is simpler. It is very typical for Git newcomers to inadvertently create merges and worst: inadvertently pushing them. This is one of the reasons many experienced users prefer to avoid 'git pull', and recommend

[PATCH v4 6/7] pull: cleanup documentation

'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt

[PATCH v4 2/7] pull: refactor $rebase variable into $mode

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-pull.sh | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 8363647..f53d193 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -48,8 +48,7 @@ if test -z $mode

[PATCH v2 0/5] remote-helpers: test reorganization

Now we use PYTHON_PATH properly, and also we are able to do: make -C contrib/remote-helpers install Felipe Contreras (5): remote-helpers: generate scripts build: fix installation of scripts remote-helpers: rename tests remote-helpers: allow direct test execution remote-helpers: add

[PATCH v3 try2] build: add default aliases

For now simply add a few common aliases. co = checkout ci = commit rb = rebase st = status Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-checkout.txt | 5 + Documentation/git-commit.txt | 5 + Documentation/git-rebase.txt | 5 +

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

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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 1dde51f..082f207 100644 ---

[PATCH v2 5/5] remote-helpers: add exec-path links

This way we don't have to modify the PATH ourselves and it's easier to test without 'make'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/Makefile | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/Makefile

[PATCH v3] Add core.mode configuration

So that we can specify general modes of operation, specifically, add the 'next' mode, which makes Git pre v2.0 behave as Git v2.0. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/add.c | 13 cache.h| 6 ++ config.c | 13

[PATCH v3 02/10] transport-helper: fix extra lines

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 rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH try2 00/14] Officially start moving to the term 'staging area'

tl;dr: everyone except Junio C Hamano and Drew Northup agrees; we should move away from the name the index. 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 best

[PATCH v3 01/10] 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 felipe.contre...@gmail.com --- transport-helper.c | 5 + 1 file changed, 5 insertions(+) diff --git a/transport-helper.c b/transport-helper.c index 63cabc3..cd913af 100644 ---

[PATCH v3 08/10] fast-export: add support to delete refs

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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 ---

[PATCH try2 05/14] rm: add --staged option

Synonym for --cached. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH try2 11/14] completion: update --staged options

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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 2b81e78..1dde51f 100644 ---

[PATCH try2 07/14] stash: add --stage to pop and apply

Synonym of --index. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH v3 00/10] transport-helper: updates

Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. Some of these were were sent before and rejected without a reason, but here they are again in case

[PATCH try2 13/14] reset: allow --keep with --stage

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH v3 09/10] transport-helper: add support to delete branches

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

[PATCH v3 05/10] fast-export: add new --refspec option

So that we can covert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 30 ++ t/t9350-fast-export.sh| 7 +++ 3 files changed, 41

[PATCH try2 08/14] submodule: add --staged options

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

[PATCH v3 07/10] fast-import: add support to delete refs

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH try2 12/14] reset: add --stage and --work options

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH try2 04/14] grep: add --staged option

Synonym for --cached. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH try2 01/14] Add proper 'stage' command

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-stage.txt| 45 + Makefile | 2 +- builtin.h | 1 + builtin/stage.c| 52

[PATCH 13/20] transport-helper: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/transport-helper.c b/transport-helper.c index b32e2d6..673b7c2 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -269,6 +269,7 @@ static const char

[PATCH v3 03/10] 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 felipe.contre...@gmail.com --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index ed3384e..46b3e57 100644 ---

[PATCH 18/20] run-command: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- run-command.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/run-command.c b/run-command.c index 1b7f88e..3914d9c 100644 --- a/run-command.c +++ b/run-command.c @@ -406,13 +406,12 @@ fail_pipe:

[PATCH try2 4/8] Add concept of 'publish' branch

The upstream branch is: branch.$name.remote branch.$name.merge The publish branch is: branch.$name.pushremote branch.$name.push Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 19 +++ remote.c | 34

[PATCH 02/20] t: replace pulls with merges

This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/annotate-tests.sh| 2 +- t/t4200-rerere.sh | 2 +- t/t9114-git-svn-dcommit-merge.sh | 2 +-

[PATCH v10 09/15] contrib: related: add support for more roles

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 14 -- contrib/related/test-related.t | 8 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/contrib/related/git-related b/contrib/related/git-related index

[PATCH v10 08/15] contrib: related: show role count

Instead of showing the total involvement, show it per role: author, or signer. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 18 +- contrib/related/test-related.t | 30 +++--- 2 files changed, 28

[PATCH try2 09/14] apply: add --stage option

Synonym for --index. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH 03/20] pull: cleanup documentation

'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt

[PATCH 07/20] shortlog: add missing declaration

Otherwise we would have to include commit.h. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- shortlog.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shortlog.h b/shortlog.h index de4f86f..54bc07c 100644 --- a/shortlog.h +++ b/shortlog.h @@ -19,6 +19,8 @@ struct shortlog {

[PATCH 19/20] setup: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.c b/setup.c index f08dd64..c717db4 100644 --- a/setup.c +++ b/setup.c @@ -566,7 +566,7 @@ static const char *setup_git_directory_gently_1(int

[PATCH try2 0/8] Introduce publish tracking branch

As it has been discussed before, our support for triangular workflows is lacking, and the following patch series aims to improve that situation. We have the concept of upstream branch (e.g. 'origin/master') which is to where our topic branches eventually should be merged to, so it makes sense

[PATCH v10 03/15] contrib: related: add support for multiple patches

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 35 +++ contrib/related/test-related.t | 13 + 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/contrib/related/git-related

[PATCH try2] sha1-name: refactor get_sha1() parsing

Instead of parsing left to right, do it right do left, this way it is much more natural and probably efficient too, as there's less recursivity. In theory there shouldn't be any functional changes, although there's at least one error message that has changed. Signed-off-by: Felipe Contreras

[PATCH 01/20] merge: simplify ff-only option

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/merge.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 02a69c1..41fb66d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@

[PATCH v10 14/15] contrib: related: add option to show commits

Instead of showing the authors and signers, show the commits themselves. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 23 +++ contrib/related/test-related.t | 10 ++ 2 files changed, 33 insertions(+) diff --git

[PATCH v10 12/15] contrib: related: add mailmap support

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 37 + contrib/related/test-related.t | 14 ++ 2 files changed, 51 insertions(+) diff --git a/contrib/related/git-related b/contrib/related/git-related

[PATCH v10 07/15] contrib: related: add helper Person classes

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related | 71 +++-- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/contrib/related/git-related b/contrib/related/git-related index

[PATCH try2 2/8] branch: reorganize verbose options

Showing the upstream tracking branch is more important than how many commits are ahead/behind, so now 'git branch -v' shows the upstream, but not the tracking info, and 'git branch -vv' shows all information (as before). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH 10/20] doc: git-foo was obsoleted several years ago

So replace 'git-foo' with 'git foo'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-checkout.txt | 4 ++-- Documentation/git-commit.txt | 4 ++-- Documentation/git-rebase.txt | 4 ++-- Documentation/git-status.txt | 4 ++-- 4 files changed, 8

[PATCH try2 3/8] push: trivial reorganization

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/push.c | 35 +++ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 04f0eaf..5dc06a3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@

[PATCH v10 13/15] contrib: related: add option parsing

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related | 85 + 1 file changed, 85 insertions(+) diff --git a/contrib/related/git-related b/contrib/related/git-related index 6ab74c7..d6b44c7 100755 ---

[PATCH 09/20] sha1-name: trivial style cleanup

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sha1_name.c b/sha1_name.c index 0e5fe7f..e9c2999 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len,

[PATCH 08/20] branch: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index ad0f86d..5696cf0 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -975,9 +975,8 @@ int

[PATCH v3] revision: add --except option

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: C (crap) B (test) A (HEAD, master) When using '--branches --except crap': B (test) A (HEAD, master) But when using '--branches

[PATCH 11/20] symbolic-ref: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/symbolic-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c index f481959..71286b4 100644 --- a/builtin/symbolic-ref.c +++ b/builtin/symbolic-ref.c @@

[PATCH v10 05/15] contrib: related: parse committish like format-patch

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 15 +++ contrib/related/test-related.t | 10 ++ 2 files changed, 25 insertions(+) diff --git a/contrib/related/git-related b/contrib/related/git-related index 4f78304..80e1f17

[PATCH v10 04/15] contrib: related: add option to parse from committish

For example master..feature-a. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 57 +++--- contrib/related/test-related.t | 10 2 files changed, 53 insertions(+), 14 deletions(-) diff --git

[PATCH try2 03/14] diff: document --staged

Synonym for --cached. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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 ---

[PATCH v10 11/15] contrib: related: allow usage on other directories

Not just the root one (of the project). Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related | 6 ++ 1 file changed, 6 insertions(+) diff --git a/contrib/related/git-related b/contrib/related/git-related index 3399307..f15e4e7 100755 ---

[PATCH 04/20] 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 felipe.contre...@gmail.com --- Documentation/git-fetch.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-fetch.txt

[PATCH v10 10/15] contrib: related: group persons with same email

Suggested-by: Duy Nguyen pclo...@gmail.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 2 +- contrib/related/test-related.t | 12 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/contrib/related/git-related

[PATCH v10 00/15] New git-related helper

This tool finds people that might be interested in a patch, by going back through the history for each single hunk modified, and finding people that reviewed, acknowledged, signed, or authored the code the patch is modifying. It does this by running `git blame` incrementally on each hunk, and

[PATCH 16/20] revision: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/revision.c b/revision.c index 0173e01..4049867 100644 --- a/revision.c +++ b/revision.c @@ -1503,7 +1503,7 @@ struct cmdline_pathspec {

[PATCH 12/20] alias: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- alias.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/alias.c b/alias.c index eb9f08b..9938f03 100644 --- a/alias.c +++ b/alias.c @@ -5,7 +5,7 @@ static char *alias_val; static int

[PATCH v4 1/2] version-gen: cleanup

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- GIT-VERSION-GEN | 36 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 06026ea..e96538d 100755 --- a/GIT-VERSION-GEN

[PATCH v4 2/2] version-gen: fix versions

Virtually all packaging guidelines would prefer 1.8.4~rc1, over 1.8.4.rc1 or 1.8.4-rc1, so it makes sense to use that instead. In particular, the only packaging we provide, git.spec, generates a wrong version, because git-1.8.4 git-1.8.4.rc1, changing to ~rc1 fixes the problem as it's considered

[PATCH v3 06/10] transport-helper: add support for old:new refspec

By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- 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

[PATCH try2] fetch: add new fetch.default configuration

When the user has an upstream branch configured to track a remote tracking branch: % git checkout --set-upstream-to github/master Doing a 'git fetch' without any arguments would try to fetch 'github', because it's configured as current branch's remote (branch.current.remote). However, if we

[PATCH v10 15/15] contrib: related: add README

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/README | 65 ++ 1 file changed, 65 insertions(+) create mode 100644 contrib/related/README diff --git a/contrib/related/README b/contrib/related/README new file mode

[PATCH try2 1/8] branch: trivial cleanup

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0836890..ac17b18 100644 --- a/builtin/branch.c +++

[PATCH try2 7/8] push: add --set-publish option

To setup publish tracking branch, like 'git branch --set-publish'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-push.txt | 9 +- builtin/push.c | 2 ++ t/t5529-push-publish.sh| 70 ++

[PATCH 14/20] describe: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/describe.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index b9d3603..6f62109 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -9,7 +9,7 @@

[PATCH v10 02/15] contrib: related: add tests

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/Makefile | 17 + contrib/related/test-related.t | 54 ++ 2 files changed, 71 insertions(+) create mode 100644 contrib/related/Makefile create mode 100755

[PATCH v10 06/15] contrib: related: print the amount of involvement

100% means the person was involved in all the commits, in one way or the other. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related| 2 +- contrib/related/test-related.t | 30 +++--- 2 files changed, 16 insertions(+), 16

[PATCH 06/20] revision: add missing include

Otherwise we might not have 'struct diff_options'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.h | 1 + 1 file changed, 1 insertion(+) diff --git a/revision.h b/revision.h index e7f1d21..89132df 100644 --- a/revision.h +++ b/revision.h @@ -5,6 +5,7 @@ #include

[PATCH v4 0/2] Version fixes and cleanups

Chances since v3: diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 19902e9..c04c4de 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -26,8 +26,10 @@ describe () { if test -f version then VN=$(cat version) || VN=$DEF_VER -elif test ! -d ${GIT_DIR:-.git} -a ! -f .git || !

My patches

Hi, Clearly, a lot of my patches have not been reviewed properly, so even though they are technically correct, and would benefit users, some have specifically been requested by them, and at least one would significantly improve Git's user interface... they are going nowhere. Here is the summary,

Re: [PATCH 16/20] revision: trivial style fixes

On 10/12/2013 09:07 AM, Felipe Contreras wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/revision.c b/revision.c index 0173e01..4049867 100644 --- a/revision.c +++

[PATCH 2/2] Add SVN trust-server-cert parameter to git svn to accept SSL server certificates from unknwon authorities without prompting

From: arnaudbrejeon arnaud.brej...@gmail.com Signed-off-by: Arnaud Brejeon arnaud.brejeon at gmail.com --- git-svn.perl |1 + perl/Git/SVN/Prompt.pm |9 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index 07f0a6c..3dfd4d3

Re: Git send-email fail on Mac OS X Lion

On Fri, Oct 11, 2013 at 11:06:17PM -0500, Fernando Ortiz (e2k) wrote: I'm getting the following error when I do: git send-email --compose --from Fernando Ortiz eratos2...@gmail.com --to forti...@gmail.com --cc forti...@gmail.com 0001-Change-zcat-to-gzcat-to-fix-build-restore-steps.patch

Re: [BAD PATCH 0/9] v4-aware tree walker API

On Fri, 11 Oct 2013, Duy Nguyen wrote: On Fri, Oct 11, 2013 at 07:22:59PM +0700, Duy Nguyen wrote: Maybe we could make an exception and allow the tree walker to pass pv4_tree_cache* directly to decode_entries so it does not need to do the first lookup every time..

Re: pack-object's try_delta fast path for v2 trees?

On Sat, 12 Oct 2013, Duy Nguyen wrote: Hi, Just wondering if this has been considered and dropped before. Currently we use try_delta() for every object including trees. But trees are special. All tree entries must be unique and sorted. That helps simplify diff algorithm, as demonstrated by

Re: [BAD PATCH 0/9] v4-aware tree walker API

On Sat, Oct 12, 2013 at 9:42 PM, Nicolas Pitre n...@fluxnic.net wrote: On Fri, 11 Oct 2013, Duy Nguyen wrote: On Fri, Oct 11, 2013 at 07:22:59PM +0700, Duy Nguyen wrote: Maybe we could make an exception and allow the tree walker to pass pv4_tree_cache* directly to decode_entries so it

Re: My patches

From: Felipe Contreras felipe.contre...@gmail.com Sent: Saturday, October 12, 2013 8:24 AM Hi, Clearly, a lot of my patches have not been reviewed properly, so even though they are technically correct, and would benefit users, some have specifically been requested by them, and at least one

Re: Git send-email fail on Mac OS X Lion

Brian, I already tried to reinstall with cpan/m using -f -i options. I even removed the PERL5LIB location and reinstalled the packages from scratch to no avail. Nando Sent from my iPhone On Oct 12, 2013, at 8:47 AM, brian m. carlson sand...@crustytoothpaste.net wrote: On Fri, Oct 11,

Re: [PATCH v2] mergetools/diffmerge: support DiffMerge as a git mergetool

Thanks for the re-roll. We're very close; see below. On Fri, Oct 11, 2013 at 10:01 PM, Stefan Saasen ssaa...@atlassian.com wrote: DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux. See http://www.sourcegear.com/diffmerge/ DiffMerge includes a script

[PATCH v3] diff.c: keep arrow(=) on show_stats()'s shortened filename part to make rename visible.

git diff -M --stat can detect rename and show renamed file name like foofoofoo = barbarbar, but if destination filename is long the line is shortened like ...barbarbar so there is no way to know whether the file is renamed or existed in the source commit. This commit makes it visible like ...foo =

[PATCH v3] diff.c: keep arrow(=) on show_stats()'s shortened filename part to make rename visible.

git diff -M --stat can detect rename and show renamed file name like foofoofoo = barbarbar, but if destination filename is long the line is shortened like ...barbarbar so there is no way to know whether the file is renamed or existed in the source commit. This commit makes it visible like ...foo =

Re: [spf:guess,mismatch] [PATCH v2] diff.c: keep arrow(=) on show_stats()'s shortened filename part to make rename visible.

Hello On Oct 12, 2013, at 8:35 AM, Keshav Kini keshav.k...@gmail.com wrote: Sam Vilain s...@vilain.net writes: On 10/11/2013 06:07 AM, Yoshioka Tsuneo wrote: + prefix_len = ((prefix_len = 0) ? prefix_len : 0); + strncpy(pre_arrow, arrow

Re: [PATCH v2] mergetools/diffmerge: support DiffMerge as a git mergetool

Not a problem. I'll change it to: tools=$tools gvimdiff diffuse diffmerge ecmerge tools=$tools p4merge araxis bc3 code compare and send a v3. Thanks for the review David. On 13 October 2013 06:55, David Aguilar dav...@gmail.com wrote: Thanks for the re-roll. We're very close; see below. On

[PATCH v3] mergetools/diffmerge: support DiffMerge as a git mergetool

DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux. See http://www.sourcegear.com/diffmerge/ DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the graphical compare tool. This change adds mergetool support for DiffMerge and adds

[PATCH] http: enable keepalive on TCP sockets

This is a follow up to commit e47a8583a20256851e7fc882233e3bd5bf33dc6e (enable SO_KEEPALIVE for connected TCP sockets). Sockets may never receive notification of some link errors, causing git fetch or similar processes to hang forever. Enabling keepalive messages allows hung processes to error

Re: My patches

On Sat, Oct 12, 2013 at 11:18 AM, Philip Oakley philipoak...@iee.org wrote: From: Felipe Contreras felipe.contre...@gmail.com Sent: Saturday, October 12, 2013 8:24 AM Clearly, a lot of my patches have not been reviewed properly, so even though they are technically correct, and would benefit

Re: [RFC/PATCHv3 2/3] git-svn: Warn about changing default for --prefix in Git v2.0

Johan Herland jo...@herland.net wrote: In Git v2.0, we will change the default --prefix for init/clone from none/empty to origin/ (which causes SVN-tracking branches to be placed at refs/remotes/origin/* instead of refs/remotes/*). This patch warns users about the upcoming change, both in