On 07.09.12 23:55, Junio C Hamano wrote:
> [Discarded]
>
> * jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
> . macos: lazily initialize iconv
>
> Teach the code that works around NKD/NKC gotcha on MacOS to call
> iconv_open() only when it is necessary, in the hope of avoiding
> set-up ov
On Fri, Sep 7, 2012 at 8:34 PM, Enrico Weigelt wrote:
>
>> > Well, everybody can access the objects, but they're encrypted,
>> > so you need the repo key (which, of course isn't contained in
>> > the repo itself ;-p) to decrypt them.
>>
>> So, in short, blobs are not encrypted with the hash of the
> > Well, everybody can access the objects, but they're encrypted,
> > so you need the repo key (which, of course isn't contained in
> > the repo itself ;-p) to decrypt them.
>
> So, in short, blobs are not encrypted with the hash of their
> contents as encryption keys at all.
No, the blobs are
Thomas Gummerer writes:
> On 09/04, Junio C Hamano wrote:
>> * tg/index-v5 (2012-08-17) 13 commits
>> ...
>> A GSoC project. Was waiting for comments from mentors and
>> stakeholders, but nothing seems to be happening, other than breakage
>> fixes on Cygwin. May discard.
>
> I was planning on c
On Fri, Sep 7, 2012 at 1:27 PM, Junio C Hamano wrote:
> Jim Cromie writes:
>
>> Broader question:
>
>> Im thinking that having a hotfix branch, and merging --no-commit would
>> work better,
>> especially when bisection lands on a commit which already contains
>> some of those in the hotfix branch
Stephen Bash writes:
> From reading the docs it's obvious the current -Xours and -Xtheirs
> expect to work on hunks, so I (mostly) understand the current
> behavior, but as a user it feels like "I'm telling you how to
> resolve conflicts, please do the same thing for binary files".
Even though m
Junio C Hamano writes:
> experience in such a language, I know I was talked into doing it
> this way when we did 23cb5bf (i18n of multi-line advice messages,
> 2011-12-22). Could you dig around the list archive to see?
Heh, don't bother. Instead, start reading from here:
http://thread.gmane
Ralf Thielow writes:
> On Fri, Sep 7, 2012 at 10:52 PM, Junio C Hamano wrote:
>> Ralf Thielow writes:
>>
>>> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano wrote:
>>>
> - fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
> + fprintf(stderr, "%s %.*s\n", p
On Fri, Sep 7, 2012 at 10:52 PM, Junio C Hamano wrote:
> Ralf Thielow writes:
>
>> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano wrote:
>>
- fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
+ fprintf(stderr, "%s %.*s\n", prefix, (int)(np - cp), cp);
>>>
Ralf Thielow writes:
> On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano wrote:
>
>>> - fprintf(stderr, _("hint: %.*s\n"), (int)(np - cp), cp);
>>> + fprintf(stderr, "%s %.*s\n", prefix, (int)(np - cp), cp);
>>
>> Hrm, naively, printf("%s: %.*s\n", _("hint"), ...) might loo
Junio C Hamano writes:
> But that is not what is happening at all. What goes on is far
> simpler than that.
>
> - the shell sees '*', matches it against working tree files, to
>obtain "f1" and "f2";
>
> - the shell tells "git" to "checkout e6f935e -- f1 f2";
>
> - "git" looks into the tre
Nguyễn Thái Ngọc Duy writes:
> + if (opts->track != BRANCH_TRACK_UNSPECIFIED)
> + die(_("%s cannot be used with updating paths"), "--track");
I think most of the places we try to enclose these literals inside
quotes, so I'd squash in a patch to make this:
die(_(
Junio C Hamano wrote:
> cleanup_path() is a quick-and-dirty hack that only deals with
> leading ".///" (e.g. "foo//bar" is not reduced to "foo/bar"), and
> the callers that allocate 4 bytes for buf to hold "foo" may not be
> able to fit it if for some reason there are some bytes that must be
> clea
Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> The current implementation of git_path() is essentially the same as
>> that of vsnpath(), with two minor differences. First, git_path()
>> currently insists that the git directory path is no longer than
>> PATH_MAX-100 characters in length. Howeve
On Fri, Sep 7, 2012 at 9:32 PM, Junio C Hamano wrote:
> Ralf Thielow writes:
>
>> Extract a function that allows to print messages
>> with a prefix.
>>
>> Signed-off-by: Ralf Thielow
>> ---
>> advice.c | 14 ++
>> advice.h | 1 +
>> 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Z
Ralf Thielow writes:
> Extract a function that allows to print messages
> with a prefix.
>
> Signed-off-by: Ralf Thielow
> ---
> advice.c | 14 ++
> advice.h | 1 +
> 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
>
> diff --git a/advice.c b/advice.c
> index edf
Jim Cromie writes:
> Broader question:
> Im thinking that having a hotfix branch, and merging --no-commit would
> work better,
> especially when bisection lands on a commit which already contains
> some of those in the hotfix branch.
When your history leading to the "bad" commit contains only p
Extract a function that allows to print messages
with a prefix.
Signed-off-by: Ralf Thielow
---
advice.c | 14 ++
advice.h | 1 +
2 Dateien geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/advice.c b/advice.c
index edfbd4a..e73d53b 100644
--- a/advice.c
+++ b/a
Signed-off-by: Ralf Thielow
---
usage.c | 2 +-
1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)
diff --git a/usage.c b/usage.c
index a2a6678..162a4b2 100644
--- a/usage.c
+++ b/usage.c
@@ -44,7 +44,7 @@ static void error_builtin(const char *err, va_list params)
static void warn_
This is a short implementation of an idea i have, based
on Junio's comment. It might not follows the coding style,
the comments can be adverse and so on...
Just want to know if it's the right direction.
This series introduces a function that allows to add
a prefix to multilined messages. The funct
On Fri, Sep 7, 2012 at 9:41 AM, Jean-Baptiste Quenot wrote:
> Hi Jonas,
Hello Jean-Baptiste
> With tig 1.0 how to feed specific revisions to the main view?
>
> The following hack worked until tig 0.17:
>
> [alias]
> tignowalk-helper = !git rev-list --pretty=raw --no-walk --stdin<
>
> TIG
hi all.
Im trying to add a jumplabel implementation into dynamic-debug,
and have run into an include-dependency problem.
Ive managed to resolve 1 problem, and am now stuck on how to use cherry-pick -m
1st, the problem Ive handled (just for setup, story)
I did a simple hotfix bisection, adding:
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Friday, September 07, 2012 6:41 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: [PATCH v3] Support for setitimer() on platforms lacking it
>
> "Joachim Schmitz" writes:
>
> > HP NonStop (currently) doesn't have setitimer
> -Original Message-
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Friday, September 07, 2012 7:30 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: [PATCH] Document MKDIR_WO_TRAILING_SLASH in Makefile
>
> "Joachim Schmitz" writes:
>
> > Signed-off-by: Joach
Stefan Naewe writes:
> While looking for a way to expand the URL of a remote
> that uses a 'url..insteadOf' config option I stumbled
> over the undocumented '--get-url' option of 'git ls-remote'.
> This adds some minimum documentation for that option.
>
> And while at it, also add that option to
Ralf Thielow writes:
> On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow wrote:
>> On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin wrote:
>>> I just notice that the 1st line of the orignal message below has
>>> only 56 characters, much shorter than other lines. It is because
>>> this is a warning messag
"Joachim Schmitz" writes:
> Signed-off-by: Joachim Schmitz
> ---
> Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index ac49320..03e245a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -90,6 +90,8 @@ all::
> #
> # Define NO_MKDTEMP if you don't have mk
Thanks.
--
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
Michael J Gruber writes:
> Nguyễn Thái Ngọc Duy venit, vidit, dixit 06.09.2012 16:28:
>> rev-list-options.txt is included in git-rev-list.txt. This makes sure
>> rev-list man page also shows that, and at one place, together with
>> equivalent options -n and --max-count.
>>
>> Signed-off-by: Nguy
On Fri, Sep 7, 2012 at 7:05 PM, Ralf Thielow wrote:
> On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow wrote:
>> On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin wrote:
>>> I just notice that the 1st line of the orignal message below has
>>> only 56 characters, much shorter than other lines. It is becaus
Dan Johnson writes:
> When fetch is invoked with --all, we need to pass the tag-following
> preference to each individual fetch; without this, we will always
> auto-follow tags, preventing us from fetching the remote tags into a
> remote-specific namespace, for example.
>
> Reported-by: Oswald Bu
On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow wrote:
> On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin wrote:
>> I just notice that the 1st line of the orignal message below has
>> only 56 characters, much shorter than other lines. It is because
>> this is a warning message, and would add a prefix: "w
Adam Spiers writes:
> On Sun, Sep 2, 2012 at 9:35 PM, Junio C Hamano wrote:
>> * avoid unnnecessary braces {} around single statement blocks, e.g.
>>
>> -if (exclude) {
>> +if (exclude)
>> return exclude;
>> -}
>>
>> * else should follow close brace '}' of if clause, e.g.
>
"Joachim Schmitz" writes:
> HP NonStop (currently) doesn't have setitimer(). The previous attempt of an
> emulation (reverted by this commit) was not a real substitute for a recurring
> itimer (as here we also don't have SA_RESTART, so can't re-arm the timer).
> As setitimer() is only used in cas
On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin wrote:
> I just notice that the 1st line of the orignal message below has
> only 56 characters, much shorter than other lines. It is because
> this is a warning message, and would add a prefix: "warning: ".
>
> #: builtin/push.c:151
> msgid ""
> "push.de
This way it gets added to gnulib too.
Signed-off-by: Joachim Schmitz
---
compat/poll/poll.c | 5 +
1 file changed, 4 insertions(+)
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index e4b8319..10a204e 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -306,6 +306,10 @@ comput
Hi all-
Helping a coworker resolve merge conflicts today I found I wanted a -Xtheirs
that completely replaces conflicted binary files with the copy from the
incoming branch. In other words rather than doing
$ git merge maint
... conflicts occur ...
$ git checkout --theirs -- path/to/bina
On Thu, Sep 06, 2012 at 02:01:30PM -0700, Jeffrey Middleton wrote:
> I'm generally very happy with the fuzzy parsing. It's a great feature
> that is designed to and in general does save users a lot of time and
> thought. In this case I don't think it does. The problems are:
> (1) It's not ignoring
Yann Dirson writes:
> In 1.7.10.3, "git rebase -i :/Merge" will complain with:
>
> fatal: Needed a single revision
> invalid upstream :/Merge
>
> ... whereas "git rev-parse :/Merge" has no problem resolving
> to a single revision.
git rebase actually calls "git rev-parse :/Merge^0", which due to
Hi Jonas,
With tig 1.0 how to feed specific revisions to the main view?
The following hack worked until tig 0.17:
[alias]
tignowalk-helper = !git rev-list --pretty=raw --no-walk --stdin<
TIG_MAIN_CMD="git tignowalk-helper $tmp" tig :
> Hello,
>
> Version 1.0 of tig is now available. Thi
In 1.7.10.3, "git rebase -i :/Merge" will complain with:
fatal: Needed a single revision
invalid upstream :/Merge
... whereas "git rev-parse :/Merge" has no problem resolving
to a single revision. OTOH, "git rebase -i HEAD^{/Merge}" does
work, and rev-parse resolves it to the same commit.
Is th
On 09/04, Junio C Hamano wrote:
> * tg/index-v5 (2012-08-17) 13 commits
> . p0002-index.sh: add perf test for the index formats
> . update-index.c: rewrite index when index-version is given
> . Write resolve-undo data for index-v5
> . Write index-v5 cache-tree data
> . Write index-v5
> . Read
HP NonStop can't recv() on a non-socket, this commit cates for this.
So far for HP NonStop only, via #ifdef __TANDEM, but it may be usefull
for others too. A similar patch got sent to gnulib.
Signed-off-by: Joachim Schmitz
---
compat/poll/poll.c | 5 +
1 file changed, 5 insertions(+)
diff -
In order for non-win32 platforms to be able to use poll.c, #ifdef the
inclusion of two header files
Signed-off-by: Joachim Schmitz
---
compat/poll/poll.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 9e7a25c..e4b8319 100
move poll.[ch] out of compat/win32/ into compat/poll/ and adjust
Makefile with the changed paths. Adding comments to Makefile about how/when
to enable it and add logic for this
Signed-off-by: Joachim Schmitz
---
Makefile | 20 +++-
compat/{win32 => poll}/poll
If poll() is used as a milli-second sleep, like in help.c, by passing a NULL
in the 1st and a 0 in the 2nd arg, it exits with EFAULT.
As per Paolo Bonzini, the original author, this is a bug and to be fixed like
in this commit, which is not to exit if the 2nd arg is 0.
Signed-off-by: Joachim Schm
Here's now my series or patches to make the win32 implementation of poll()
available to other platforms:
1 - poll() exits too early with EFAULT if 1st arg is NULL, as discussed with
Paolo Bonzini from the gnulib team
2 - make poll available for other platforms lacking it by moving it into a
sep
Signed-off-by: Joachim Schmitz
---
Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
index ac49320..03e245a 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,8 @@ all::
#
# Define NO_MKDTEMP if you don't have mkdtemp in the C library.
#
+# Define MKDIR_WO_TRAI
I just notice that the 1st line of the orignal message below has
only 56 characters, much shorter than other lines. It is because
this is a warning message, and would add a prefix: "warning: ".
#: builtin/push.c:151
msgid ""
"push.default is unset; its implicit value is changing in\n"
"Git 2.0 fr
On Sun, Sep 2, 2012 at 9:35 PM, Junio C Hamano wrote:
> * avoid unnnecessary braces {} around single statement blocks, e.g.
>
> -if (exclude) {
> +if (exclude)
> return exclude;
> -}
>
> * else should follow close brace '}' of if clause, e.g.
>
> if (...) {
> ..
Junio C Hamano venit, vidit, dixit 06.09.2012 20:34:
> Michael J Gruber writes:
>
>> Junio C Hamano venit, vidit, dixit 06.09.2012 07:07:
>>> Michael J Gruber writes:
>>>
The pre-commit hook is often used to ensure certain properties
of each comitted tree like formatting or coding sta
HP NonStop (currently) doesn't have setitimer(). The previous attempt of an
emulation (reverted by this commit) was not a real substitute for a recurring
itimer (as here we also don't have SA_RESTART, so can't re-arm the timer).
As setitimer() is only used in cases of perceived latency and it doesn
Il 07/09/2012 09:39, Joachim Schmitz ha scritto:
>> > I suppose it works to always handle ENOTSOCK that way, even on
>> > non-__TANDEM systems.
> Will you be fixing this in gnulib? How?
I don't have access to the system, so it's best if you post the patches
yourself to bug-gnulib and git mailing l
On Fri, Sep 7, 2012 at 10:28 AM, Andreas Schwab wrote:
> Stefan Naewe writes:
>
>> +--get-url::
>> + Expand the URL of the given remote repository taking into account any
>> + "url..insteadOf" config setting (See linkgit:git-config[1]).
>
> This should probably also mention that it suppre
Nguyễn Thái Ngọc Duy venit, vidit, dixit 06.09.2012 16:28:
> rev-list-options.txt is included in git-rev-list.txt. This makes sure
> rev-list man page also shows that, and at one place, together with
> equivalent options -n and --max-count.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> Documen
Stefan Naewe writes:
> +--get-url::
> + Expand the URL of the given remote repository taking into account any
> + "url..insteadOf" config setting (See linkgit:git-config[1]).
This should probably also mention that it suppresses the normal output.
(I wonder why this isn't a subcommand of
> From: Paolo Bonzini [mailto:paolo.bonz...@gmail.com] On Behalf Of Paolo
> Bonzini
> Sent: Thursday, September 06, 2012 4:32 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org; 'Junio C Hamano'; 'Erik Faye-Lund';
> bug-gnu...@gnu.org; rsbec...@nexbridge.com
> Subject: Re: poll() emulation in git
> From: Paolo Bonzini [mailto:paolo.bonz...@gmail.com] On Behalf Of Paolo
> Bonzini
> Sent: Thursday, September 06, 2012 5:15 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org; 'Junio C Hamano'; 'Erik Faye-Lund';
> bug-gnu...@gnu.org; rsbec...@nexbridge.com
> Subject: Re: poll() emulation in git
> From: Thomas Gummerer [mailto:t.gumme...@gmail.com]
> Sent: Monday, August 27, 2012 11:40 AM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: [PATCH/RFC v4 02/13] read-cache.c: Re-read index if index file
> changed
>
> On 08/25, Joachim Schmitz wrote:
> > "Thomas Gummerer" schrie
59 matches
Mail list logo
