Roman Kagan writes:
> + # workaround for a bug in svn serf backend (v1.8.5 and below):
> + # store 3d argument to ->add_file() in a local variable, to make it
> + # have the same lifetime as $fbat
> + my $upa = $self->url_path($m->{file_a});
> my $fbat = $self->add_file($sel
To ease development, prioritize ./git-completion.bash over other
standard system paths.
Signed-off-by: Ramkumar Ramachandra
---
contrib/completion/git-completion.zsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh
b/contrib/completion/gi
Hi,
I figured that branch.autosetupmerge, branch.autosetuprebase and
remote.pushdefault are very tedious to type out in full, and started
looking into fixing their completions this evening. The solution turns
out to be much more complex than I initally imagined, but I'm quite
happy with the soluti
There are situations where two classes of completions possible. For
example
branch.
should try to complete
branch.master.
branch.autosetupmerge
branch.autosetuprebase
The first candidate has the suffix ".", and the second/ third candidates
have the suffix " ". To facilitate completions
When attempting to complete
$ git config branch.auto
'autosetupmerge' and 'autosetuprebase' don't come up. This is because
"$cur" is matched with "branch.*" and a list of branches are
completed. Add 'autosetup(merge|rebase)' to the list of branches using
__gitcomp_2 ().
Also take care to not c
When attempting to complete
$ git config remote.push
'pushdefault' doesn't come up. This is because "$cur" is matched with
"remote.*" and a list of remotes are completed. Add 'pushdefault' to the
list of remotes using __gitcomp_2 ().
Also take care to not complete
$ git config remote.pushde
2013/12/30 Thomas Rast :
> Roman Kagan writes:
>
>> + # workaround for a bug in svn serf backend (v1.8.5 and below):
>> + # store 3d argument to ->add_file() in a local variable, to make it
>> + # have the same lifetime as $fbat
>> + my $upa = $self->url_path($m->{file_a});
>>
Signed-off-by: Ramkumar Ramachandra
---
builtin/for-each-ref.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 6551e7b..51798b4 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -92,7 +92,7 @@ static str
I forgot to do 'ssh-add', so a 'git fetch' running under Windows Emacs
tried to prompt for the ssh passphrase, could not find an ssh
passphrase
prompt program, and aborted.
That left the workspace unusable:
- .git/FETCH_HEAD is empty
that causes 'git rev-parse FETCH_HEAD' to fail with a c
Christian Couder writes:
> +# Do not remove trailing spaces below!
> +cat >complex_message_trailers <<'EOF'
> +Fixes:
> +Acked-by:
> +Reviewed-by:
> +Signed-off-by:
> +EOF
Just a hint. I think it is far safer and robust over time to do
something like this:
sed -e 's/ Z$/ /' <<-\EOF
Jonathan Nieder writes:
> Jeff King wrote:
>
>> When I want to debug a failing test, I often end up doing:
>>
>> cd t
>> ./t4107- -v -i
>> cd tra
>>
>> The test names are long, so tab-completing on the trash directory is
>> very helpful. Lately I've noticed that there are a bunch of crufty
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Jeff King wrote:
>>> When I want to debug a failing test, I often end up doing:
>>>
>>> cd t
>>> ./t4107- -v -i
>>> cd tra
>>>
>>> The test names are long, so tab-completing on the trash directory is
>>> very helpful. Lately I've noticed th
Василий Макаров writes:
> Hi there!
> First of all: I'm new to mailing-lists, sorry if I'm doing it wrong.
>
> I've found a bug in git merge-base, causing it to show not best common
> ancestors and duplicates under some circumstances (example is given in
> attached test case).
Attached???
> Pro
Jeff King writes:
> If they are not allowed to recurse, the problem is much easier; the
> parent fetch simply tells all of the sub-invocations not to expand the
> arguments further. However, whether it was planned or not, it has been
> this way for a long time. I would not be surprised if somebod
Mike Hommey writes:
> On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote:
>> Mercurial can have bookmarks pointing to "nullid" (the empty root
>> revision), while Git can not have references to it.
>> When cloning or fetching from a Mercurial repository that has such a
>> bookmark, t
Jonathan Nieder writes:
> Does that make sense?
Sure, sounds good to me.
--
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
stephen_le...@stephe-leake.org writes:
> That left the workspace unusable:
>
> - .git/FETCH_HEAD is empty
>
> that causes 'git rev-parse FETCH_HEAD' to fail with a confusing
> error message.
This is not limited to your Cygwin environment. I can see that we
leave an empty file there after
Roman Kagan writes:
> 2013/12/28 Junio C Hamano :
>> Eric Wong writes:
>>> git://git.bogomips.org/git-svn.git master
>>>
>>> for you to fetch changes up to 2394e94e831991348688831a384b088a424c7ace:
>>>
>>> git-svn: workaround for a bug in svn serf backend (2013-12-27 20:22:19
>>> +)
>>>
On 2013-12-30 18.07, stephen_le...@stephe-leake.org wrote:
> I forgot to do 'ssh-add', so a 'git fetch' running under Windows Emacs
Windows native emacs or emacs under cygwin ?
> tried to prompt for the ssh passphrase, could not find an ssh passphrase
> prompt program, and aborted.
>
> That left t
Junio C Hamano writes:
> I do not offhand remember if it was deliberate that we do not dedup
> the result from the underlying get_octopus_merge_bases() (the most
> likely reason for not deduping is because the caller is expected to
> do that if it wants to).
>
> Whether it is an improvement to fo
On Mon, Dec 30, 2013 at 09:19:55AM -0800, Junio C Hamano wrote:
> Christian Couder writes:
>
> > +# Do not remove trailing spaces below!
> > +cat >complex_message_trailers <<'EOF'
> > +Fixes:
> > +Acked-by:
> > +Reviewed-by:
> > +Signed-off-by:
> > +EOF
>
> Just a hint. I think it is far sa
Ramkumar Ramachandra writes:
> Signed-off-by: Ramkumar Ramachandra
> ---
Interesting. As far as I can tell, no code ever used this symbol
since the command was introduced at 9f613ddd (Add git-for-each-ref:
helper for language bindings, 2006-09-15).
> builtin/for-each-ref.c | 3 +--
> 1 file c
Christian Couder writes:
> The only changes compared to version 3 are the following:
I'll queue this instead on top, as the series is already in 'next'.
Thanks.
-- >8 --
From: Christian Couder
Date: Sat, 28 Dec 2013 12:00:05 +0100
Subject: [PATCH] replace info: rename 'full' to 'long' and cla
Josh Triplett writes:
> On Mon, Dec 30, 2013 at 09:19:55AM -0800, Junio C Hamano wrote:
>> Christian Couder writes:
>>
>> > +# Do not remove trailing spaces below!
>> > +cat >complex_message_trailers <<'EOF'
>> > +Fixes:
>> > +Acked-by:
>> > +Reviewed-by:
>> > +Signed-off-by:
>> > +EOF
>>
On Mon, Dec 30, 2013 at 12:46:33PM -0800, Junio C Hamano wrote:
> Josh Triplett writes:
>
> > On Mon, Dec 30, 2013 at 09:19:55AM -0800, Junio C Hamano wrote:
> >> Christian Couder writes:
> >>
> >> > +# Do not remove trailing spaces below!
> >> > +cat >complex_message_trailers <<'EOF'
> >> > +F
Josh Triplett writes:
>> - The "everybody will have a single SP at the end" may or may not
>>last forever;
>
> Trivially fixed if that ever changes, but given the nature of all of
> these, that seems unlikely.
Why? Because we encourage to write tests that are expected to find
breakages, so
This avoids list_commands_in_dir() being called when not needed which is
quite slow due to file I/O in order to list matching files in a directory.
Signed-off-by: Sebastian Schuberth
---
builtin/help.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin
Since 2dce956 is_git_command() was a bit slow as it does file I/O in the
call to list_commands_in_dir(). Avoid the file I/O by adding an early
check for internal commands.
Signed-off-by: Sebastian Schuberth
---
builtin/help.c | 5 ++
git.c | 242 ++-
On Mon, Dec 30, 2013 at 01:05:25PM -0800, Junio C Hamano wrote:
> Josh Triplett writes:
> >> - With your scheme, if you already had _one_ trailing SPs in the
> >>input, it would be hard to spot in the source;
> >
> > Git makes them quite difficult to miss. :)
>
> That is irrelevant, isn't it
On Mon, Dec 30, 2013 at 08:41:13AM +0100, Antoine Pelisse wrote:
> On Sun, Dec 29, 2013 at 11:24 PM, Mike Hommey wrote:
> > On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote:
> >> Mercurial can have bookmarks pointing to "nullid" (the empty root
> >> revision), while Git can not have
Dear fans of Git,
this mail brings to you the good news that Git for Windows is available in
a new version: 1.8.5.2-preview20131230
Many, many thanks go to the tireless developers working on this
particularly hard port of Git.
Changes since Git-1.8.4-preview20130916
New Features
- Comes with G
From: Junio C Hamano
>
> Christian Couder writes:
>
>> The only changes compared to version 3 are the following:
>
> I'll queue this instead on top, as the series is already in 'next'.
Great!
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a
2013/12/30 Junio C Hamano :
> Roman Kagan writes:
>> I'd like to note that it's IMO worth including in the 'maint' branch
>> as it's a crasher. Especially so since the real fix has been merged
>> in the subversion upstream and nominated for 1.8 branch, so the
>> workaround may soon lose its relev
33 matches
Mail list logo
