On Wed, Oct 3, 2012 at 10:44 PM, Alexey Spiridonov
wrote:
> Thanks a lot for trying this.
>
> My hashes match. I just re-reproduced it on two flavors of Linux (64
> and 32-bit), with two different Git versions (see below). What
> platform are you using?
x86, 32 bit. Perhaps it has something to do
We support backslash escape, but we hide the details behind the phrase
"a shell glob suitable for consumption by fnmatch(3)". So it may not
be obvious how one can get literal # or ! at the beginning of pattern.
Add a few lines on how to work around the magic characters.
Signed-off-by: Nguyễn Thái
On 10/6/12 8:31 AM, Jeff King wrote:
On Thu, Oct 04, 2012 at 11:10:40AM -0500, John Whitney wrote:
Thank you for your response. I do see the dilemma, but having
no possible "unmodified" state is extremely inconvenient and,
as shown, breaks basic git operations.
But you have asked for an imposs
On Sat, Oct 06, 2012 at 05:51:15PM +0200, Thomas Ackermann wrote:
> I wanted to have a single PDF file which contains the complete Git
> documentation
> (except user-manual) for easier reading on my tablet. The simplest way to do
> this was by using wkhtmltopdf which can combine a set of HTML f
Subversion represents symlinks as ordinary files with content
starting with "link " and the svn:special property set to "*". Thus a
file can switch between being a symlink and a non-symlink simply by
toggling its svn:special property, and new checkouts will
automatically write a file of the approp
Ramsay Jones writes:
> The malloc checks can be disabled using the TEST_NO_MALLOC_CHECK
> variable, either from the environment or command line of an
> 'make test' invocation. In order to allow the malloc checks to be
> disabled from the 'config.mak' file, we add TEST_NO_MALLOC_CHECK
> to the env
On Sat, Oct 06, 2012 at 05:55:58PM +0200, Thomas Ackermann wrote:
> - create html for all release note files
> [...]
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 86594f6..80eb06d 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -24,6 +24,7 @@ SP_A
On Sat, Oct 06, 2012 at 05:58:01PM +0200, Thomas Ackermann wrote:
> - use wkhtmltopdf to combine all html files into a single pdf file
> "git-doc.pdf"
> - provide make target "fullpdf" to create "git-doc.pdf"
>
> Signed-off-by: Thomas Ackermann
> ---
> Documentation/.gitignore | 1 +
> D
On Sat, Oct 06, 2012 at 11:39:13AM -0700, Junio C Hamano wrote:
> Thomas Ackermann writes:
>
> > Signed-off-by: Thomas Ackermann
> > ---
> > Documentation/git-bisect-lk2009.txt | 12 ++--
> > Documentation/git-fetch-pack.txt| 5 -
> > 2 files changed, 10 insertions(+), 7 delet
On Sat, Oct 06, 2012 at 11:32:51AM -0700, Conrad Irwin wrote:
> I think I messed up sending somehow:
Thanks for resending.
> > What state should the "add -p" interaction start from for path F?
> > Should you be picking from a patch between the state you previously
> > "git add"ed to the index an
From: "Thomas Ackermann"
- create html for all release note files
- fix some asciidoc layout problems
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 2 ++
Documentation/RelNotes/1.5.2.1.txt | 6 --
Documentation/RelNotes/1.6.0.2.txt | 6 --
Documentation/RelNotes
From: "Thomas Ackermann"
- add missing files
- fix some asciidoc layout problems
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile| 12 ++-
Documentation/technical/index-format.txt | 2 +-
Documentation/technical/pack-format.txt | 8 +++
Documentation
Thomas Ackermann writes:
> Signed-off-by: Thomas Ackermann
> ---
> Documentation/git-bisect-lk2009.txt | 12 ++--
> Documentation/git-fetch-pack.txt| 5 -
> 2 files changed, 10 insertions(+), 7 deletions(-)
You didn't say what "layout problem" you are fixing, or what the
appro
I think I messed up sending somehow:
On Fri, Oct 5, 2012 at 11:26 PM, Junio C Hamano wrote:
> Suppose you have two paths E and F, both of which have differences
> between HEAD and the index, and the index and the working tree file
> (i.e. you earlier edited E and F, did "git add E F" and further
On Sat, Oct 06, 2012 at 11:22:50AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Another option is to leave it with "-i" semantics in the meantime, which
> > are at least easy to explain: it is simply a shorthand for running "git
> > add -p && git commit". That may be inconsistent with
Sven Strickroth writes:
> Am 04.01.2012 01:12 schrieb Junio C Hamano:
>> Now "prompt" is no longer a method but is merely a helper function, so
>> I've queued this (and 1/2 rewrite we discussed in a separate thread) to
>> 'pu' after rewording the commit log message.
>>
>> Thanks.
>
> Is there a
Jeff King writes:
> I'd be slightly worried that we are hurting other people who do care and
> are on older versions of asciidoc. It would be nice if we actually knew
> the cause of the different behaviors we saw and if there was a way to
> work around it (it might not even be old asciidoc, but r
Jeff King writes:
> Another option is to leave it with "-i" semantics in the meantime, which
> are at least easy to explain: it is simply a shorthand for running "git
> add -p && git commit". That may be inconsistent with other aspects of
> commit, but people have (apparently) been happy with it,
The malloc checks can be disabled using the TEST_NO_MALLOC_CHECK
variable, either from the environment or command line of an
'make test' invocation. In order to allow the malloc checks to be
disabled from the 'config.mak' file, we add TEST_NO_MALLOC_CHECK
to the environment using an export directi
On Mon, Sep 24, 2012 at 08:25:39PM -0400, Jeff King wrote:
> @@ -1168,7 +1180,11 @@ void format_commit_message(const struct commit *commit,
> free(enc);
> }
>
> - strbuf_expand(sb, format, format_commit_item, &context);
> + if (pretty_ctx->fmt == CMIT_FMT_USERFORMAT)
- use wkhtmltopdf to combine all html files into a single pdf file "git-doc.pdf"
- provide make target "fullpdf" to create "git-doc.pdf"
Signed-off-by: Thomas Ackermann
---
Documentation/.gitignore | 1 +
Documentation/Makefile| 9 +
Documentation/footerend.txt | 4
- add missing files
- fix some asciidoc layout problems
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 10 +
Documentation/howto/maintain-git.txt | 4 ++
.../howto/rebase-from-internal-branch.txt | 11 ++---
Documentation/howt
- create html for all release note files
- fix some asciidoc layout problems
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 2 ++
Documentation/RelNotes/1.5.2.1.txt | 6 --
Documentation/RelNotes/1.6.0.2.txt | 6 --
Documentation/RelNotes/1.6.1.3.txt | 4
D
- add missing files
- fix some asciidoc layout problems
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile| 12 ++-
Documentation/technical/index-format.txt | 2 +-
Documentation/technical/pack-format.txt | 8 +++
Documentation/technical/pack-protocol
Signed-off-by: Thomas Ackermann
---
Documentation/git-bisect-lk2009.txt | 12 ++--
Documentation/git-fetch-pack.txt| 5 -
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-bisect-lk2009.txt
b/Documentation/git-bisect-lk2009.txt
index 8a2ba37..99b
Hi,
I wanted to have a single PDF file which contains the complete Git
documentation
(except user-manual) for easier reading on my tablet. The simplest way to do
this was by using wkhtmltopdf which can combine a set of HTML files into a
sinlge
PDF file and also apply some reformatting. To thi
On Sat, Oct 06, 2012 at 08:51:24PM +0700, Nguyen Thai Ngoc Duy wrote:
> We support backslash escape, but we hide the details behind the phrase
> "a shell glob suitable for consumption by fnmatch(3)". So it may not
> be obvious how one can get literal # or ! at the beginning of pattern.
> Add a few
Am 04.01.2012 01:12 schrieb Junio C Hamano:
> Now "prompt" is no longer a method but is merely a helper function, so
> I've queued this (and 1/2 rewrite we discussed in a separate thread) to
> 'pu' after rewording the commit log message.
>
> Thanks.
Is there a reason why these changes did not get
We support backslash escape, but we hide the details behind the phrase
"a shell glob suitable for consumption by fnmatch(3)". So it may not
be obvious how one can get literal # or ! at the beginning of pattern.
Add a few lines on how to work around the magic characters.
Signed-off-by: Nguyễn Thái
On Thu, Oct 04, 2012 at 11:10:40AM -0500, John Whitney wrote:
> Thank you for your response. I do see the dilemma, but having
> no possible "unmodified" state is extremely inconvenient and,
> as shown, breaks basic git operations.
But you have asked for an impossible state. You have said "this fi
On Sat, Oct 06, 2012 at 06:43:50PM +0700, Nguyen Thai Ngoc Duy wrote:
> On Sat, Oct 6, 2012 at 6:33 PM, Philip Oakley wrote:
> >> Asciidoc 8.2.6 does not like me writing
> >> "Put \# if you need a literal #.." so I go with "backslash" and
> >> "hash" instead. `\!` displays fine both in man page a
On Fri, Oct 05, 2012 at 11:26:47PM -0700, Junio C Hamano wrote:
> In the case of "add/commit --interactive", it is much more clear
> what state the index is in when the command gave interactive control
> to the user. The short-cut "add/commit -p" interface, however, does
> not give you an access
On Fri, Oct 05, 2012 at 10:20:37PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> >> > @@ -617,6 +618,8 @@ static struct commit_list
> >> > *paint_down_to_common(struct commit *one, int n, struc
> >> >
> >> > one->object.flags |= PARENT1;
> >> > commit_list_insert_by_d
On Sat, Oct 6, 2012 at 6:33 PM, Philip Oakley wrote:
>> Asciidoc 8.2.6 does not like me writing
>> "Put \# if you need a literal #.." so I go with "backslash" and
>> "hash" instead. `\!` displays fine both in man page and html format.
>> '!' changed to `!` because it looks clearer in monospace.
>
From: "Nguyễn Thái Ngọc Duy"
We support backslash escape, but we hide the details behind the phrase
"a shell glob suitable for consumption by fnmatch(3)". So it may not
be obvious how one can get literal # or ! at the beginning of a
pattern.
Add a few lines on how to work around the magic char
Thiago Farina wrote:
On Fri, Oct 5, 2012 at 1:41 AM, Nguyễn Thái Ngọc Duy
wrote:
This makes wildmatch.c part of libgit.a and builds test-wildmatch;
the dependency on libpopt in the original has been replaced with the
use
of our parse-options. Global variables in test-wildmatch are marked
static
We support backslash escape, but we hide the details behind the phrase
"a shell glob suitable for consumption by fnmatch(3)". So it may not
be obvious how one can get literal # or ! at the beginning of a pattern.
Add a few lines on how to work around the magic characters.
Signed-off-by: Nguyễn Thá
On 10/01/2012 06:51 AM, Michael Haggerty wrote:
> I think I would advocate that the prefix has to match the front of the
> path exactly (including any trailing slashes) and either
>
> strlen(prefix) == 0
> or the prefix ended with a '/'
> or the prefix and path are identical
> or t
On Sat, Oct 6, 2012 at 2:54 PM, Junio C Hamano wrote:
> Shouldn't we do the same for quoting fnmatch(3) metacharacters? To
> match a path component 'a' followed by an asterisk followed by 'b',
> you could then write 'a\*b'. Same for quoting the backslash itself.
I think my patch does that too.
Nguyễn Thái Ngọc Duy writes:
> .gitattributes pattern syntax is supposed to be the same as .gitignore
> (except a few things that do not make sense in attr context, but
> that's a different issue). .gitignore uses fnmatch() as the matching
> machinery and "\" is accepted as an escape code. In th
.gitattributes pattern syntax is supposed to be the same as .gitignore
(except a few things that do not make sense in attr context, but
that's a different issue). .gitignore uses fnmatch() as the matching
machinery and "\" is accepted as an escape code. In theory the pattern
'foo\ bar' should match
Nguyen Thai Ngoc Duy writes:
> On Sat, Oct 6, 2012 at 12:36 PM, Junio C Hamano wrote:
>>> Or the user might think "path/ attr1" sets attr1 for all files under
>>> "path/" because it does not make sense to attach attributes to a
>>> directory in git.
>>
>>...
>>
>>We may not have a need t
42 matches
Mail list logo
