On Mon, Oct 1, 2012 at 3:18 PM, Jeff King wrote:
> On Mon, Oct 01, 2012 at 02:23:06PM -0700, Shawn O. Pearce wrote:
>>
>> When libcurl fails to connect to an SSL server always retry the
>> request once. Since the connection failed before the HTTP headers
>> can be sent, no data has exchanged hands
Is the newish push.default documented in the "git push" manpage
anywhere? I don't see it mentioned (and there are several references
to the "default" behavior), but maybe I'm missing something. Is it
left out on purpose (ie, config values aren't supposed to be mentioned
in command manpages)?
--dav
On Mon, Oct 1, 2012 at 5:23 PM, Shawn O. Pearce wrote:
> From: "Shawn O. Pearce"
>
> When libcurl fails to connect to an SSL server always retry the
> request once. Since the connection failed before the HTTP headers
> can be sent, no data has exchanged hands, so the remote side has
> not learned
Jeff King writes:
> On Mon, Oct 01, 2012 at 02:53:17PM -0700, Junio C Hamano wrote:
>
>> "Shawn O. Pearce" writes:
>>
>> > + for (attempts = 0; attempts < 2; attempts++) {
>> > + if (start_active_slot(slot)) {
>> > + run_active_slot(slot);
>> > + if (
Jeff King writes:
> I don't buy the "gitk should be read-only" argument from that thread. I
> think we decided a while back[1] that the stat cache is not really a
> user-visible modification; you're not updating the index in any
> meaningful way that impacts the user's workflow, but merely refres
A release candidate Git v1.8.0-rc0 is now available for testing at
the usual places. There are a couple of leftover features we might
merge before the final release, but other than that, this is meant
to be more or less feature-complete preview of the upcoming 1.8.0.
The release tarballs are foun
On Sun, Sep 30, 2012 at 01:34:58PM -0700, Jonathan Nieder wrote:
> Jeff King wrote:
> > On Sun, Sep 30, 2012 at 10:05:27AM +1000, Paul Mackerras wrote:
>
> >> Unfortunately this will wait for the git update-index command to
> >> complete, making the GUI unresponsive while it executes, and that ca
On Mon, Oct 01, 2012 at 02:53:17PM -0700, Junio C Hamano wrote:
> "Shawn O. Pearce" writes:
>
> > + for (attempts = 0; attempts < 2; attempts++) {
> > + if (start_active_slot(slot)) {
> > + run_active_slot(slot);
> > + if (slot->results->curl_resul
On Mon, Oct 01, 2012 at 02:23:06PM -0700, Shawn O. Pearce wrote:
> From: "Shawn O. Pearce"
>
> When libcurl fails to connect to an SSL server always retry the
> request once. Since the connection failed before the HTTP headers
> can be sent, no data has exchanged hands, so the remote side has
>
"Shawn O. Pearce" writes:
> + for (attempts = 0; attempts < 2; attempts++) {
> + if (start_active_slot(slot)) {
> + run_active_slot(slot);
> + if (slot->results->curl_result ==
> CURLE_SSL_CONNECT_ERROR)
> + cont
"Shawn O. Pearce" writes:
> Lets assume the site operators (Hi Google!) have a clue and are
> doing everything they already can to ensure secure, successful
> SSL connections from a wide range of HTTP clients. Implementing a
> single level of retry in the client can make it more robust against
>
From: "Shawn O. Pearce"
When libcurl fails to connect to an SSL server always retry the
request once. Since the connection failed before the HTTP headers
can be sent, no data has exchanged hands, so the remote side has
not learned of the request and will not perform it twice.
In the wild we have
I was not aware of git subtree. I'll go and do some reading. Thanks
for the pointer!
On 1 October 2012 17:40, Jens Lehmann wrote:
>
> Am 01.10.2012 14:05, schrieb Howard Miller:
> >>
> >> Perhaps:
> >>
> >> git rm -f --cached path/to/subdir # remove from index, keep files
> >> git add path/
Simon Oosthoek writes:
> It's possible to set PS1 to nothing and print a string from
> PROMPT_COMMAND, but then you miss out on all the features of the PS1
> interpretation by bash and compared to the use of __git_ps1 at the
> moment, it has to put out quite a different string. Because if you lik
"Philip Oakley" writes:
>> All of the above are expected and working as designed. Remote
>> tracking branches are local _copies_ of what you have over there at
>> the remote repository. The latter is the authoritative version, and
>> you asked "ls-remote" to go over the network to view them.
>>
On 01/10/12 21:54, Junio C Hamano wrote:
> Now you lost me. The documentation of PROMPT_COMMAND in "man bash"
> says this:
>
>PROMPT_COMMAND
> If set, the value is executed as a command prior to
> issuing each primary prompt.
>
> So yes, if you say "PROMPT_COM
"Philip Oakley" writes:
>> This actually is not about --no-ff but about --no-tags. Any option
>> that "pull" itself does not care about stops the command line parser
>> and the remainder of the command line is fed to underlying "fetch".
>>
>
> Should this be said within the documentation's synop
From: "Junio C Hamano"
Jens Hausherr writes:
I came across an issue with deleting remote branches: When deleting a
branch using "git branch r d " the branch is deleted and no
longer shown by "git branch r".
"git ls-remote --heads" on the other hand still lists the ref for the
last
branc
From: "Junio C Hamano"
乙酸鋰 writes:
The order of options in git pull is not clear in the documentation
It only says
git pull [options] [ [...]]
So we have no idea which options should come first
I tried
git pull -v --no-tags --progress --no-ff origin
but failed with unknown option 'no-ff'.
B
Simon Oosthoek writes:
> On 01/10/12 21:13, Junio C Hamano wrote:
>
>> Hrm, let me ask a stupid question. Why do we even need __git_ps1_pc
>> in the first place? Wouldn't it be just the matter of
>>
>> PROMPT_COMMAND='__git_ps1 "%s"'
>>
>> once you have __git_ps1 that works?
>
> Apart fr
On 01/10/12 21:13, Junio C Hamano wrote:
> Hrm, let me ask a stupid question. Why do we even need __git_ps1_pc
> in the first place? Wouldn't it be just the matter of
>
> PROMPT_COMMAND='__git_ps1 "%s"'
>
> once you have __git_ps1 that works?
Apart from one small detail, PS1 must be set
Ben Walton writes:
> Previously while reading the variable names in config files, there was
> a 256 character limit with at most 128 of those characters being used
> by the section header portion of the variable name. This limitation
> was only enforced while reading the config files. It was po
Am 01.10.2012 19:33, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> Am 01.10.2012 08:45, schrieb Ramkumar Ramachandra:
>>> Jens Lehmann wrote:
I'm very interested in your feedback as a first time submodule user,
what you wrote above makes sense and explains why you did that patch
Junio C Hamano writes:
>> I agree that it's ugly. How about the following:
>>
>> I modified __git_ps1 to work both in PROMPT_COMMAND mode and in that
>> mode support color hints.
>>
>> This way there's one function, so no overlap.
>
> I think the logical progression would be
>
> - there are part
On 01/10/12 19:16, Junio C Hamano wrote:
> Simon Oosthoek writes:
>
>> On 09/28/2012 07:58 PM, Junio C Hamano wrote:
>>> Simon Oosthoek writes:
>>>
+# __git_ps1_pc accepts 0 arguments (for now)
+# It is meant to be used as PROMPT_COMMAND, it sets PS1
+__git_ps1_pc ()
+{
This reproduces in trunk, 1.7.8.4, and 1.7.9.5.
I suspect this has to do with a whitespace + no trailing newline
issues. The patch was generated by 1.7.9.5. I mangled it by hand to
get it to be small, but the initial crash happened on a large,
real-world output of "git format-patch".
Error messag
Olaf Klischat writes:
> ... scenarios where you want to feed the file list into git add
> via find or other external commands (`find | xargs git add'),
> which you wouldn't want to carefully tune...
Can you explain this kind of thing in the actual commit log message
when you reroll (if you
On Mon, Oct 01, 2012 at 06:03:47PM +, Arnd Bergmann wrote:
> On Monday 01 October 2012, Greg KH wrote:
> > Wait, what happened to the diffstat? Does the latest version of git not
> > send out the diffstat for 'git request-pull'? It used to on older
> > versions, I just updated the version on
On Monday 01 October 2012, Greg KH wrote:
> Wait, what happened to the diffstat? Does the latest version of git not
> send out the diffstat for 'git request-pull'? It used to on older
> versions, I just updated the version on my machine that generated this
> to
> git version 1.7.12.2.421.
Junio C Hamano writes:
>> static struct option builtin_add_options[] = {
>> OPT__DRY_RUN(&show_only, N_("dry run")),
>> @@ -329,6 +329,7 @@ static struct option builtin_add_options[] = {
>> OPT_BOOLEAN( 0 , "refresh", &refresh_only, N_("don't add, only refresh
>> the index")),
>>
Olaf Klischat writes:
> Signed-off-by: Olaf Klischat
> ---
I am personally not sympathetic to the reasoning stated in the
proposed commit log message above your signed-off-by line; the
change is not justified at all.
But I'll comment on the code changes anyway.
> builtin/add.c | 14 ++
On Mon, Oct 01, 2012 at 10:54:33AM -0700, Greg KH wrote:
> The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
>
> Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Jens Lehmann writes:
> Me too would expect a show command to show me a list of all the
> submodules and maybe some extra information (is it populated or
> not, does it have its .git directory embedded, does it contain
> changes). So maybe "show" should be a slightly pimped "status"?
What's the n
Hi Jens,
Jens Lehmann wrote:
> Am 01.10.2012 08:45, schrieb Ramkumar Ramachandra:
>> Jens Lehmann wrote:
>>> I'm very interested in your feedback as a first time submodule user,
>>> what you wrote above makes sense and explains why you did that patch
>>> (and it would have been nice to read some o
Andrew Wong writes:
> The same workaround was used for Shift-F4 in:
> cea07cf8dc9b3677e0c50433c0d72bce83adbdc7
>
> Signed-off-by: Andrew Wong
> ---
> gitk-git/gitk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/gitk-git/gitk b/gitk-git/gitk
> index d93bd99..698b84a 100755
> --- a/gi
Am 01.10.2012 08:45, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> I'm very interested in your feedback as a first time submodule user,
>> what you wrote above makes sense and explains why you did that patch
>> (and it would have been nice to read some of it in the commit message
>> ;-). W
On 10/01/2012 07:21 PM, Josef Assad wrote:
> On 10/01/2012 07:11 PM, Junio C Hamano wrote:
>> Josef Assad writes:
>>
>>> Signed-off-by: Josef Assad
>>> ---
>>> gitk-git/gitk |6 ++
>>> 1 files changed, 6 insertions(+), 0 deletions(-)
>>
>> Thanks.
>>
>>> diff --git a/gitk-git/gitk b/gitk
Am 01.10.2012 08:42, schrieb Ramkumar Ramachandra:
> Jens Lehmann wrote:
>> That is just a single user so far indicating your patch /could/ be an
>> improvement. I think we need quite some more votes on that before we
>> should do a change like this.
>
> I thought it's a porcelain command like 'gi
Jens Hausherr writes:
> I came across an issue with deleting remote branches: When deleting a
> branch using "git branch r d " the branch is deleted and no
> longer shown by "git branch r".
>
> "git ls-remote --heads" on the other hand still lists the ref for the last
> branch commit.
>
> If I
Simon Oosthoek writes:
> On 09/28/2012 07:58 PM, Junio C Hamano wrote:
>> Simon Oosthoek writes:
>>
>>> +# __git_ps1_pc accepts 0 arguments (for now)
>>> +# It is meant to be used as PROMPT_COMMAND, it sets PS1
>>> +__git_ps1_pc ()
>>> +{
>>> + local g="$(__gitdir)"
>>> + if [ -n "$g" ]; the
Josef Assad writes:
> Signed-off-by: Josef Assad
> ---
> gitk-git/gitk |6 ++
> 1 files changed, 6 insertions(+), 0 deletions(-)
Thanks.
> diff --git a/gitk-git/gitk b/gitk-git/gitk
> index d93bd99..7e2e0a7 100755
> --- a/gitk-git/gitk
> +++ b/gitk-git/gitk
> @@ -11680,6 +11680,12 @@
Am 01.10.2012 14:05, schrieb Howard Miller:
>>
>> Perhaps:
>>
>> git rm -f --cached path/to/subdir # remove from index, keep files
>> git add path/to/subdir
>>
>> -- Hannes
>
> Fantastic worked perfectly. I'll write that down somewhere for
> the next time I do it :)
>
> Is there a bett
Ramkumar Ramachandra writes:
> Hi Junio,
>
> Junio C Hamano wrote:
>> Matthieu Moy writes:
>>
>>> Junio C Hamano writes:
>>>
I haven't been paying attention, but does that mean on that system,
a total stranger kseygold can write, modify, and remove whatever Ram
owns? I am hoping
The same workaround was used for Shift-F4 in:
cea07cf8dc9b3677e0c50433c0d72bce83adbdc7
Signed-off-by: Andrew Wong
---
gitk-git/gitk | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d93bd99..698b84a 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2496,6
Sorry, my previous "git send-email" screwed up. Resending the email again.
I was running into the same issue too. It turns out that on some machines
Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround.
The same workaround was used for Shift-F4.
Andrew Wong (1):
gitk: Ad
The same workaround was used for Shift-F4 in:
cea07cf8dc9b3677e0c50433c0d72bce83adbdc7
Signed-off-by: Andrew Wong
---
gitk-git/gitk | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d93bd99..698b84a 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2496,6
I was running into the same issue too. It turns out that on some machines
Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround.
The same workaround was used for Shift-F4.
Andrew Wong (1):
gitk: Add workaround for system where Shift-F5 mapped to
Shift-XF86_Switch_VT_5
Josef Assad wrote:
Hi. I ran across what is a decidedly trivial little issue in gitk. The
TCL/Tk looked simple enough so I am giving you a patch anyhow in case
you want to fix it.
When for whatever reason the git binary is unavailable, gitk would
complain about missing git repository instead, so
On Sun, Sep 30, 2012 at 03:10:48PM -0700, Linus Torvalds wrote:
> This code goes all the way back to March of 2007, in commit 87ab79923463
> ("builtin-mailinfo.c infrastrcture changes"), and apparently Don used to
> pass random mbox contents to git. However, the pre-decode vs post-decode
> logic
Hi,
I came across an issue with deleting remote branches: When deleting a
branch using "git branch r d " the branch is deleted and no
longer shown by "git branch r".
"git ls-remote --heads" on the other hand still lists the ref for the last
branch commit.
If I delete the branch using "git pus
>
> Perhaps:
>
> git rm -f --cached path/to/subdir # remove from index, keep files
> git add path/to/subdir
>
> -- Hannes
Fantastic worked perfectly. I'll write that down somewhere for
the next time I do it :)
Is there a better way of handling sub-modules like that? I've looked
at git
Am 10/1/2012 12:41, schrieb Howard Miller:
> - I have an existing (long standing) project in git with an upstream in github
> - I added a subdirectory which I had forgotten was itself a git
> project (i.e. it has its own .git directory)
> - I committed the subdirectory (git add /path/to/subdir; gi
Hi,
I did this and now am confused/stuck...
- I have an existing (long standing) project in git with an upstream in github
- I added a subdirectory which I had forgotten was itself a git
project (i.e. it has its own .git directory)
- I committed the subdirectory (git add /path/to/subdir; git com
On 09/28/2012 07:58 PM, Junio C Hamano wrote:
Simon Oosthoek writes:
+# __git_ps1_pc accepts 0 arguments (for now)
+# It is meant to be used as PROMPT_COMMAND, it sets PS1
+__git_ps1_pc ()
+{
+ local g="$(__gitdir)"
+ if [ -n "$g" ]; then
+...
+ fi
+}
This looks awfully sim
Clicking on a line that connects commit nodes produces this error:
can't read "cflist_top": no such variable
can't read "cflist_top": no such variable
while executing
"$cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend""
(procedure "highlightfile" line 4)
invoked from wi
Ramkumar Ramachandra wrote:
Hi Junio,
Junio C Hamano wrote:
Matthieu Moy writes:
Junio C Hamano writes:
I haven't been paying attention, but does that mean on that system,
a total stranger kseygold can write, modify, and remove whatever
Ram owns? I am hoping that is not the case.
I can
Hi Junio,
Junio C Hamano wrote:
> Matthieu Moy writes:
>
>> Junio C Hamano writes:
>>
>>> I haven't been paying attention, but does that mean on that system,
>>> a total stranger kseygold can write, modify, and remove whatever Ram
>>> owns? I am hoping that is not the case.
>>
>> I can see two
Hi. I ran across what is a decidedly trivial little issue in gitk. The
TCL/Tk looked simple enough so I am giving you a patch anyhow in case
you want to fix it.
When for whatever reason the git binary is unavailable, gitk would
complain about missing git repository instead, so this patch adds a
ch
Signed-off-by: Olaf Klischat
---
builtin/add.c | 14 +++---
t/t3700-add.sh | 17 -
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index e664100..61bb9ce 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -313,7 +313,7 @@ s
Signed-off-by: Olaf Klischat
---
Documentation/git-add.txt | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index fd9e36b..a5a1cd1 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@
This adds an -s|--silent-ignore option to git-add, which causes
ignored files that were specified explicitly on the command line to be
silently ignored, rather than abandoning the command. I found this
useful for scenarios where you want to feed the file list into git add
via find or other external
61 matches
Mail list logo
