Re: [PATCH gitk 0/4] gitk support for git log -L

Junio C Hamano writes: > Thomas Rast writes: > >> Whether the option value is a separate argument in argv, or directly >> stuck to the option. >> >> stuck: gitk -L:foo:main.c >> unstuck: gitk -L :foo:main.c >> >> Existing gitk chokes on 'gitk -S foo', but works with 'git -Sfoo'. > > I somehow

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

Johan Herland 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 the git-svn >

Re: My patches

On Sat, Oct 12, 2013 at 11:18 AM, Philip Oakley wrote: > From: "Felipe Contreras" > 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 users, some have >> specifically been re

[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 'diffmer

[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 o

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 wrote: > Thanks for the re-roll. We're very close; see below. > > On Fri, Oct

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 wrote: > Sam Vilain writes: > >> On 10/11/2013 06:07 AM, Yoshioka Tsuneo wrote: >>> + prefix_len = ((prefix_len >= 0) ? prefix_len : >>> 0); >>> + strncpy(pre_arrow, arrow - prefix_len, >>> pre

[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 ".

[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 ".

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 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 `/usr/bin/diffmerge`

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" > wrote: > >> On Fri, Oct 11, 2013 at 11:06:17PM -050

Re: My patches

From: "Felipe Contreras" 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 would significantly improve

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

On Sat, Oct 12, 2013 at 9:42 PM, Nicolas Pitre 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 does

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 demonstrat

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: 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 --to > forti...@gmail.com --cc forti...@gmail.com > 0001-Change-zcat-to-gzcat-to-fix-build-restore-steps.patch > > Net::SSLeay v

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

Stefan Beller wrote: > While talking about trivia, what is the projects stance on > such constructs here? > while (foo) > bar(); > foobar(); > > I've seen an empty line between the bar(); and the foobar(); often, which > suits readability. > What's the stance on such an

Re: BUG - git clean

> mkdir test > cd test > git init . > mkdir ba > mkdir ba/ca > > # So far so good. > # Should clean directory "ba/ca" > git clean -dn -- ba/ca > > # Should clean "ba/ca" and ignore non-existent "j" > # Instead, it wants to delete "ba" totally. > git clean -dn -- ba/ca j actually, my git will als

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

From: arnaudbrejeon Signed-off-by: Arnaud Brejeon 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 100755 --- a/git-svn.perl +++ b/git-svn.per

[PATCH 1/2] Add password parameter to git svn commands and use it when provided instead of defaulting to end-user prompt

From: arnaudbrejeon Signed-off-by: Arnaud Brejeon gmail.com> --- git-svn.perl |3 +++ perl/Git/SVN/Prompt.pm | 12 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index ff1ce3d..07f0a6c 100755 --- a/git-svn.perl +++ b/git-

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

On 10/12/2013 09:07 AM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > 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

Re: [PATCH 12/20] alias: trivial style fix

On 10/12/2013 09:07 AM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras Not sure if it's worth by a newcomer. ;) Reviewed-by: Stefan Beller > --- > alias.c | 13 +++-- > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/alias.c b/alias.c > index eb9f08b..9938

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,

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

Suggested-by: Duy Nguyen Signed-off-by: Felipe Contreras --- 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 b/contrib/related/git-related index f94f5f4..3399307 1

[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 then

[PATCH 16/20] revision: trivial style fixes

Signed-off-by: Felipe Contreras --- 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 { static void append_prune_data(

[PATCH 12/20] alias: trivial style fix

Signed-off-by: Felipe Contreras --- 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 alias_lookup_cb(const char *k, const char

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

No functional changes. Signed-off-by: Felipe Contreras --- 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 +++ b/GIT-VERSION-GEN @@ -6,

[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 --- 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 8c4c539..8

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

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

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

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

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

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

[PATCH try2 03/14] 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 try2 1/8] branch: trivial cleanup

No functional changes. Signed-off-by: Felipe Contreras --- 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 +++ b/builtin/branch.c @@ -425,16 +425,15

[PATCH v3 04/10] 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/builtin/fa

[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 --- contrib/related/git-related| 2 +- contrib/related/test-related.t | 30 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib

[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 || ! descri

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

Signed-off-by: Felipe Contreras --- 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 --- a/contrib/related/git-related +++ b/contri

[PATCH 00/20] Trivial paches

Felipe Contreras (20): merge: simplify ff-only option t: replace pulls with merges pull: cleanup documentation fetch: add missing documentation remote: fix trivial memory leak revision: add missing include shortlog: add missing declaration branch: trivial style fix sha1-name: tr

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

Signed-off-by: Felipe Contreras --- 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, unsigned char *sha1, ret

[PATCH 08/20] branch: trivial style fix

Signed-off-by: Felipe Contreras --- 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 cmd_branch(int argc, const char **argv

[PATCH 05/20] remote: fix trivial memory leak

There's no need to set the default remote name beforehand, only to be overridden later on, and causing a memory leak, we can do it after the configuration has been handled. Signed-off-by: Felipe Contreras --- remote.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/remote.c

[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 --not

[PATCH 17/20] diff: trivial style fix

Signed-off-by: Felipe Contreras --- builtin/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/diff.c b/builtin/diff.c index 2fb8c5d..adb93a9 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -169,7 +169,7 @@ static int builtin_diff_tree(struct rev_info *revs,

[PATCH 14/20] describe: trivial style fixes

Signed-off-by: Felipe Contreras --- 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 @@ #include "hash.h" #include "a

[PATCH 06/20] revision: add missing include

Otherwise we might not have 'struct diff_options'. Signed-off-by: Felipe Contreras --- 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 "grep.h" #include "notes.h" #i

[PATCH try2 5/8] branch: allow configuring the publish branch

Signed-off-by: Felipe Contreras --- Documentation/git-branch.txt | 11 + branch.c | 43 ++ branch.h | 2 ++ builtin/branch.c | 56 4 files changed, 108 inserti

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

Signed-off-by: Felipe Contreras --- 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 b/contrib/related/git-related index 66c1009.

[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 --- 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 @@ -186,13 +186,6 @@ static int o

[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 --- contrib/related/git-related| 23 +++ contrib/related/test-related.t | 10 ++ 2 files changed, 33 insertions(+) diff --git a/contrib/related/git-related b/

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

Signed-off-by: Felipe Contreras --- 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 index f15e4e7..6ab74c7 10075

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

No functional changes. Signed-off-by: Felipe Contreras --- 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 ffce839..3cac925 100755 --- a

[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 --- builtin/branch.c | 22 +

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

So replace 'git-foo' with 'git foo'. Signed-off-by: Felipe Contreras --- Documentation/git-checkout.txt | 4 ++-- Documentation/git-commit.txt | 4 ++-- Documentation/git-rebase.txt | 4 ++-- Documentation/git-status.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --gi

[PATCH try2 3/8] push: trivial reorganization

Signed-off-by: Felipe Contreras --- 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 @@ -113,20 +113,11 @@ static NORETUR

[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 --- Documentation/git-fetch.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index e08a028

[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 --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index beea1

[PATCH 07/20] shortlog: add missing declaration

Otherwise we would have to include commit.h. Signed-off-by: Felipe Contreras --- 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 { struct string_list

[PATCH 20/20] 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 *prefix

[PATCH 19/20] setup: trivial style fixes

Signed-off-by: Felipe Contreras --- 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 *nongit_ok) { const cha

[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 that

[PATCH v10 01/15] Add new git-related helper to contrib

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

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

Signed-off-by: Felipe Contreras --- 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 100755 --- a/contrib/related/gi

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

Not just the root one (of the project). Signed-off-by: Felipe Contreras --- 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 --- a/contrib/related/git-related +++ b/contri

[PATCH try2 6/8] t: branch add publish branch tests

Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 76 +++ 1 file changed, 76 insertions(+) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 44ec6a4..cd0b8e9 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -870,4 +870,80

[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 --- builtin/push.c | 19 +++ remote.c | 34 -- remote.h | 4

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

This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras --- t/annotate-tests.sh| 2 +- t/t4200-rerere.sh | 2 +- t/t9114-git-svn-dcommit-merge.sh | 2 +- t/t9500-gitweb-standalone-no-errors.sh | 2 +- 4 files changed,

[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 --- contrib/related/git-related| 18 +- contrib/related/test-related.t | 30 +++--- 2 files changed, 28 insertions(+), 20 deletions(-) diff

[PATCH try2 09/14] 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/Document

[PATCH try2 10/14] apply: add --work, --no-work options

'git apply', 'git apply --index', 'git apply --cached' do different things, but what they do is not precisely clear, specially since no other commands has similar distinctions. With --no-work (--work being the default), it's clear what the option would do; modify, or not, the working directory. S

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

Signed-off-by: Felipe Contreras --- 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 @@ -47,7 +47,7 @@ int cmd_symbolic

[PATCH try2 8/8] branch: display publish branch

Signed-off-by: Felipe Contreras --- builtin/branch.c | 52 +++- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index cf33e1c..9f15f7e 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -42,6 +

[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..remote). However, if we do someth

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

Signed-off-by: Felipe Contreras --- 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 100644 index 000..26188ca

[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 --- 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 --- a/transport-helper.c +++ b/

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

Signed-off-by: Felipe Contreras --- 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 15/20] pretty: trivial style fix

Signed-off-by: Felipe Contreras --- pretty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pretty.c b/pretty.c index b4e32b7..962e82b 100644 --- a/pretty.c +++ b/pretty.c @@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp, static int is_empty_line(const c

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

Signed-off-by: Felipe Contreras --- 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 04c56f5..f94f5f4 100755 --- a/contr

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

Signed-off-by: Felipe Contreras --- 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 *unsupported_options[] = {

[PATCH try2 08/14] 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 bfef8a

[PATCH v3 07/10] 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/Doc

[PATCH try2 12/14] 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-res

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

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

[PATCH try2 02/14] 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-sta

[PATCH try2 11/14] 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 2b81e78..1dde51f 100644 --- a/contrib/completion/git-com

[PATCH try2 07/14] 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/Doc

[PATCH v3 05/10] 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/Do

[PATCH try2 04/14] 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/Documentati

[PATCH try2 06/14] 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..7

[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 --- transport-helper.c | 5 + 1 file changed, 5 insertions(+) diff --git a/transport-helper.c b/transport-helper.c index 63cabc3..cd913af 100644 --- a/transport-helper.c +++ b/transp

[PATCH v3 08/10] 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-expor

[PATCH v3 10/10] 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 ddb3309..d94eaf4 100644 --- a/transport-helper.c +++ b/transport-he

[PATCH try2 05/14] 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-rm

[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 --- 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 v3 09/10] 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| 8 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 8e2dd9f..a

[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 Signed-off-by: Felipe Contreras --- transport-helper.c | 3 --- 1 file changed, 3

[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 bes

  1   2   >