Re: git-completion.bash error

2013-10-27 Thread Eric Sunshine
[re-adding git mailing list] Please do use Reply All and respond inline (as below) rather than top-posting. On Sun, Oct 27, 2013 at 8:47 PM, Gabriel wrote: > I have a possible broken "shell pipe". > > grep/egrep works fine when I pass a pattern and a file or folder, but > it breaks after pipe. >

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Johan Herland
On Sun, Oct 27, 2013 at 8:04 PM, Christian Couder wrote: > On Sun, Oct 27, 2013 at 2:30 PM, Johan Herland wrote: >> On Sun, Oct 27, 2013 at 1:30 PM, Christian Couder >> wrote: >>> >>> Your suggestion is very good, and it is not incompatible with command >>> line options. >>> So both could be im

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Junio C Hamano
There are unbound number of kinds of trailers people would want to add, depending on their projects' needs. We should not have to add a specific support for a tailer like this one, before thinking through to see if we can add generic support for adding arbitrary trailers to avoid code and interfac

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Jim Hill
On 10/26/13 18:34, Josh Triplett wrote: Linux Kernel ... "Fixes:" line ... containing an abbreviated commit hash This helps people (or automated tools) determine how far to backport I beg pardon if I'm rehearsing an old debate, but it seems to me it would be better and worthwhile to bring

Re: git-completion.bash error

2013-10-27 Thread Eric Sunshine
On Sun, Oct 27, 2013 at 4:59 PM, Gabriel wrote: > I've just made a clean install of OS X Mavericks and installed Git via > Homebrew, which obviously includes the contrib files. > > I sourced the git-completion.bash into my profile and I get stuck on a > error every time I try to use the autocomple

[PATCH] Change sed i\ usage to something Solaris' sed can handle

2013-10-27 Thread Ben Walton
Solaris' sed was choking on the i\ commands used in t4015-diff-whitespace as it couldn't parse the program properly. Modify two uses of sed that worked in GNU sed but not Solaris' (/usr/bin or /usr/xpg4/bin) to an equivalent form that is handled properly by both. Signed-off-by: Ben Walton --- t/

[PATCH v4 12/10] git-remote-testgit: support the new 'force' option

2013-10-27 Thread Richard Hansen
Signed-off-by: Richard Hansen --- git-remote-testgit.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/git-remote-testgit.sh b/git-remote-testgit.sh index 6d2f282..80546c1 100755 --- a/git-remote-testgit.sh +++ b/git-remote-testgit.sh @@ -6,6 +6,7 @@ url=$2 dir="$GIT_D

[PATCH v4 13/10] test: remote-helper: add test for force pushes

2013-10-27 Thread Richard Hansen
Signed-off-by: Richard Hansen --- t/t5801-remote-helpers.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index be543c0..93a7d34 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -102,6 +102,19 @@ t

[PATCH v4 11/10] fixup! transport-helper: add 'force' to 'export' helpers

2013-10-27 Thread Richard Hansen
document the new 'force' option Signed-off-by: Richard Hansen --- Documentation/gitremote-helpers.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index f1f4ca9..e75699c 100644 --- a/Documentation/gitremote-hel

git-completion.bash error

2013-10-27 Thread Gabriel
Hi. First of all, thank you and congratulations for the awesome work :) I've just made a clean install of OS X Mavericks and installed Git via Homebrew, which obviously includes the contrib files. I sourced the git-completion.bash into my profile and I get stuck on a error every time I try to us

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Christian Couder
[Sorry I already sent the reply below to Johan only instead of everyone.] Hi Johan, On Sun, Oct 27, 2013 at 11:59 AM, Johan Herland wrote: > On Sun, Oct 27, 2013 at 10:20 AM, Josh Triplett wrote: >> >> ...good suggestion: >> >> ~/src/linux$ git log --grep='stable@' --oneline --since='1 year ago

Loan Offer

2013-10-27 Thread LoanOffer
We offer Loan for 3% if you are interested do send details.contact Mr Tony Bowyer: coastalfinanceloanf...@hotmail.com -- 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-

Re: [PATCH/RFC] git clone: is an URL local or ssh

2013-10-27 Thread Eric Sunshine
On Saturday, October 26, 2013, Torsten Bögershausen wrote: > diff --git a/connect.c b/connect.c > index 06e88b0..903063e 100644 > --- a/connect.c > +++ b/connect.c > @@ -564,9 +574,9 @@ struct child_process *git_connect(int fd[2], const char > *url_orig, > char *url; > char *host,

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Stefan Beller
On 10/27/2013 05:30 PM, Thomas Rast wrote: > Stefan Beller writes: > >> I assembled an overview table, which plots the long options of >> git commands by the short letters. > [...] >> (In case thunderbird messes it up, here it is again >> http://pastebin.com/raw.php?i=JBci2Krx) >> >> As you can

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Thomas Rast
Stefan Beller writes: > I assembled an overview table, which plots the long options of > git commands by the short letters. [...] > (In case thunderbird messes it up, here it is again > http://pastebin.com/raw.php?i=JBci2Krx) > > As you can see, f is always --force except for git-config, where

[PATCH] test-lib: fix typo in comment

2013-10-27 Thread Torstein Hegge
Point test writers to the test_expect_* functions properly. Signed-off-by: Torstein Hegge --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0fa7dfd..3dc1792 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -325,7 +325,7 @@

[PATCH] reflog: handle lightweight and annotated tags equally

2013-10-27 Thread Torstein Hegge
When 'git reflog ' is called on a lightweight tag, nothing is output. However, when called on an annotated tag, shortened SHA-1s for all reachable commits are written on a single line. Teach add_pending_object_with_mode() to handle OBJ_TAG, so that 'git reflog' on an annotated tag is quiet, like i

[PATCH v2] sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

2013-10-27 Thread Johan Herland
There are cases (e.g. when running concurrent fetches in a repo) where multiple Git processes concurrently attempt to create loose objects within the same objects/XX/ dir. The creation of the loose object files is (AFAICS) safe from races, but the creation of the objects/XX/ dir in which the loose

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Johan Herland
On Sun, Oct 27, 2013 at 10:20 AM, Josh Triplett wrote: > On Sun, Oct 27, 2013 at 09:09:32AM +0100, Thomas Rast wrote: >> Josh Triplett writes: >> > On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: >> >> But I don't think that this feature should be given the "-f" short >> >> opti

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

2013-10-27 Thread Eric Sunshine
On Sun, Oct 27, 2013 at 3:05 AM, Felipe Contreras wrote: > 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(+),

git stash does not work when directory is replaced by a symlink to itself

2013-10-27 Thread Alexander Gladysh
Hi, list! See below. Best, Alexander. agladysh@work-1:~/tmp/git$ git --version git version 1.8.4.1 agladysh@work-1:~/tmp/git$ cat ./test.sh #!/bin/bash set -e mkdir alpha cd alpha git init mkdir beta echo "gamma" > beta/gamma git add beta/gamma git commit -m "initial commit" mv beta delta l

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Stefan Beller
On 10/27/2013 09:09 AM, Thomas Rast wrote: > Josh Triplett writes: > >> On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: >>> But I don't think that this feature should be given the "-f" short >>> option, as (a) -f often means "force"; (b) it will increase the >>> confusion with -

Re: [Ksummit-2013-discuss] [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Josh Triplett
On Sun, Oct 27, 2013 at 01:03:47AM -0700, Michel Lespinasse wrote: > On Sun, Oct 27, 2013 at 12:14 AM, Josh Triplett wrote: > >> > +-f :: > >> > +--fixes=:: > >> > + Add Fixes line for the specified commit at the end of the commit > >> > + log message. This line includes an abbreviated commit

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Josh Triplett
On Sun, Oct 27, 2013 at 09:09:32AM +0100, Thomas Rast wrote: > Josh Triplett writes: > > > On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: > >> But I don't think that this feature should be given the "-f" short > >> option, as (a) -f often means "force"; (b) it will increase the

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Josh Triplett
On Sun, Oct 27, 2013 at 03:33:19PM +0700, Duy Nguyen wrote: > On Sun, Oct 27, 2013 at 8:34 AM, Josh Triplett wrote: > > Add a command line option for git commit to automatically construct the > > "Fixes:" line for a commit. This avoids the need to manually construct > > that line by copy-pasting

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Duy Nguyen
On Sun, Oct 27, 2013 at 8:34 AM, Josh Triplett wrote: > Add a command line option for git commit to automatically construct the > "Fixes:" line for a commit. This avoids the need to manually construct > that line by copy-pasting the commit hash and subject. But you still have to copy/paste the h

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Thomas Rast
Josh Triplett writes: > On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: >> But I don't think that this feature should be given the "-f" short >> option, as (a) -f often means "force"; (b) it will increase the >> confusion with --fixup; (c) it just doesn't strike me as being like

Re: [Ksummit-2013-discuss] [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Michel Lespinasse
On Sun, Oct 27, 2013 at 12:14 AM, Josh Triplett wrote: >> > +-f :: >> > +--fixes=:: >> > + Add Fixes line for the specified commit at the end of the commit >> > + log message. This line includes an abbreviated commit hash for >> > + the specified commit; the `core.abbrev` option determines

Re: [PATCH] commit: Add -f, --fixes option to add Fixes: line

2013-10-27 Thread Josh Triplett
On Sun, Oct 27, 2013 at 06:42:44AM +0100, Michael Haggerty wrote: > On 10/27/2013 02:34 AM, Josh Triplett wrote: > > Linux Kernel Summit 2013 decided on a commit message convention to > > identify commits containing bugs fixed by a commit: a "Fixes:" line, > > included in the standard commit footer

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

2013-10-27 Thread Felipe Contreras
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 v4 04/10] fast-export: improve argument parsing

2013-10-27 Thread Felipe Contreras
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 78250ea..eea5b8c 100644 --- a/builtin/fa

[PATCH v4 01/10] transport-helper: add 'force' to 'export' helpers

2013-10-27 Thread Felipe Contreras
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 b32e2d6..408d596 100644 --- a/transport-helper.c +++ b/transp

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

2013-10-27 Thread Felipe Contreras
So that we can convert 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/D

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

2013-10-27 Thread Felipe Contreras
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 613f69a..4

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

2013-10-27 Thread Felipe Contreras
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 v4 02/10] transport-helper: fix extra lines

2013-10-27 Thread Felipe Contreras
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 v4 09/10] transport-helper: add support to delete branches

2013-10-27 Thread Felipe Contreras
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-helpers.sh index 407c1

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

2013-10-27 Thread Felipe Contreras
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 4f47bdd..ef91882 100644 --- a/transport-helper.c +++ b/transport-he

[PATCH v4 03/10] transport-helper: check for 'forced update' message

2013-10-27 Thread Felipe Contreras
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 707351d..f8eb143 100644 --- a/transport-helper.c +++ b/

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

2013-10-27 Thread Felipe Contreras
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 b6f623e..8ed41b4 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-expor