From: Junio C Hamano
>
> Antoine Pelisse writes:
>
>> I'm not exactly sure I understand the point of not squashing all those
>> patches together ?
>> It's not like one is going without the others, or that the commit
>> message provides some new information (except for the name of the
>> file, bu
"**" means bold in ASCIIDOC, so we need to escape it. This is similar
to 8447dc8 (gitignore.txt: fix documentation of "**" patterns -
2013-11-07)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
There is another instance of '**' in RelNotes/1.8.5.txt. Junio you
may want to fix it too.
Documentation/gl
With the introduction of :(literal), :(glob) and :(icase), :(top) is
no longer the only recognized magic signature.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
.. on top of nd/magic-pathspec..
Documentation/glossary-content.txt | 4
1 file changed, 4 deletions(-)
diff --git a/Documentation/g
On 2013-11-20 13:29, Johannes Sixt wrote:
[...]
> UU ppcadm/modules/quarantine.py
>
> That's strange. I can't tell what is going on. Perhaps you have some
> criss-cross merges in your history that merge-recursive trips over?
>
> Sorry, I don't know how to help you further.
Hah! I worked it out!
On Thu, Nov 21, 2013 at 6:48 AM, Junio C Hamano wrote:
>> We don't have many options that say "negative" in short form.
>> Either '!', '-' or '~'. '!' is already used for bash history expansion.
>> ~ looks more like $HOME expansion. Which left me '-'.
>
> I agree with your decision to reject ~,
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> This is yet another stab at the negative pathspec thing. It's not
> ready yet (there are a few XXXs) but I could use some feedback
> regarding the interface, or the behavior. It looks better this time
> now that path
Thanks; will queue.
--
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
Jens Lehmann writes:
> Changes since v2:
>
> - Honor the core.commentChar setting and add a test for that.
>
> - Fix the submodule test to set the editor in a portable way.
>
> - Only print scissor and description lines when not going to stdout
> (otherwise a "git status -v" prints that on stdo
Nguyễn Thái Ngọc Duy writes:
> builtin_diff_b_f() needs a path, not pathspec. Other modes in diff
> can deal with pathspec just fine. But because of the current
> GUARD_PATHSPEC() location, other modes also reject :(glob) and
> :(icase).
>
> Move GUARD_PATHSPEC(), and the "path" assignment state
Am 20.11.2013 22:09, schrieb Eris Belew:
> System: Windows Server 2008 R2
> Git: git version 1.8.4.msysgit.0
> Shell: Powershell V3 (No third-party modules loaded)
>
> Summary:
> When specifying a pathspec including a branch/commit, path separator
> characters are not translated. Since tab-compl
When using the '-v' option of "git commit" the diff added to the commit
message temporarily for editing is stripped off after the user exited the
editor by searching for "\ndiff --git " and truncating the commmit message
there if it is found.
But this approach has two problems:
- when the commit
Jeff King wrote:
> As for your specific corruption, I can't make heads or tails of it. It
> is not a single-bit error.
Oh, I should have mentioned that I am generating corrupt git
repositories mechanically for testing. I think in this case it prepended
some garbage to an object.
--
see shy jo
Hi,
is it possible to debug git-svn or get a more verbose / debug output
from it? I already tried with the "GIT_TRACE" variable, but it does
not include any further output on the svn methods.
Regards, Benjamin
2013/11/17 Andreas Stricker :
> Hi Jonathan
>
>> Can you give an exact sequence of ste
A release candidate Git v1.8.5-rc3 is now available for testing
at the usual places.
Regression in the previous rc's on "git blame --literal-pathspecs"
etc. has been fixed.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
df
The latest maintenance release Git v1.8.4.4 is now available at
the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
1aaa1a51b599f19125e06fa6e839c9ff2e5ac941 git-1.8.4.4.tar.gz
c2ee47c2bbf8ede70eef2a1ba936a30aa
On Wed, Nov 20, 2013 at 04:33:50PM -0400, Joey Hess wrote:
> I've got a git repository of < 2 mb, where git wants to
> allocate a rather insane amount of memory:
>
> >git fsck
> Checking object directories: 100% (256/256), done.
> fatal: Out of memory, malloc failed (tried to allocate 12486523116
Am 20.11.2013 20:35, schrieb Ramsay Jones:
> On 20/11/13 17:22, Junio C Hamano wrote:
>> Ramsay Jones writes:
>>
>>> Signed-off-by: Ramsay Jones
>>> ---
>>>
>>> Hi Jens,
>>>
>>> commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
>>> from the commit message", 19-11-2013) in 'pu' fail
System: Windows Server 2008 R2
Git: git version 1.8.4.msysgit.0
Shell: Powershell V3 (No third-party modules loaded)
Summary:
When specifying a pathspec including a branch/commit, path separator
characters are not translated. Since tab-completion in windows shells (ex:
CMD, PowerShell, not unix-
I've got a git repository of < 2 mb, where git wants to
allocate a rather insane amount of memory:
>git fsck
Checking object directories: 100% (256/256), done.
fatal: Out of memory, malloc failed (tried to allocate 124865231165 bytes)
> git show 11644b5a075dc1425e01fbba51c045cea2d0c408
fatal: Out
On 20/11/13 17:22, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Signed-off-by: Ramsay Jones
>> ---
>>
>> Hi Jens,
>>
>> commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
>> from the commit message", 19-11-2013) in 'pu' fails the new test
>> it added to t7507.
>>
>> I didn't s
On Wed, Nov 20, 2013 at 01:54:20PM -0500, Jeff King wrote:
> I'm not sure why the old $FAKE_EDITOR doesn't work there, though (not
> that it would make the test pass anyway, as it does something different
> than what the test wants, but I would not expect the shell to complain
> of failure).
Oh,
On Wed, Nov 20, 2013 at 10:33:28AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > Am I misremembering the issues with one-shot variables and functions?
>
> I think there are two problems involved.
OK, I was misremembering. I recalled the "does not unset afterwards"
part, but not the "d
Jeff King writes:
> The test_set_editor helper does some magic to help with quoting, but
> that should not be an issue in this case (since we are using "cat"). We
> are using test_set_editor elsewhere in the script, which would have set
> EDITOR previously. But I would think that GIT_EDITOR, whic
On Wed, Nov 20, 2013 at 09:22:31AM -0800, Junio C Hamano wrote:
> > commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
> > from the commit message", 19-11-2013) in 'pu' fails the new test
> > it added to t7507.
> >
> > I didn't spend too long looking at the problem, so take this patc
On Wed, Nov 20, 2013 at 6:33 PM, Junio C Hamano wrote:
> Erik Faye-Lund writes:
>
>>> ...
>>> is set to empty., 2006-04-16). At that time, the line
>>> directly above used:
>>>
>>>if (!pager)
>>>pager = "less";
>>>
>>> as a fallback, meaning that it could not possibly trigger
>>>
On Wed, Nov 20, 2013 at 6:30 PM, Jeff King wrote:
> On Wed, Nov 20, 2013 at 06:24:45PM +0100, Erik Faye-Lund wrote:
>
>> > diff --git a/pager.c b/pager.c
>> > index c1ecf65..fa19765 100644
>> > --- a/pager.c
>> > +++ b/pager.c
>> > @@ -54,7 +54,7 @@ const char *git_pager(int stdout_is_tty)
>> >
Erik Faye-Lund writes:
>> ...
>> is set to empty., 2006-04-16). At that time, the line
>> directly above used:
>>
>>if (!pager)
>>pager = "less";
>>
>> as a fallback, meaning that it could not possibly trigger
>> the optimization. Later, a3d023d (Provide a build time
>> default-pa
On Wed, Nov 20, 2013 at 06:24:45PM +0100, Erik Faye-Lund wrote:
> > diff --git a/pager.c b/pager.c
> > index c1ecf65..fa19765 100644
> > --- a/pager.c
> > +++ b/pager.c
> > @@ -54,7 +54,7 @@ const char *git_pager(int stdout_is_tty)
> > pager = getenv("PAGER");
> > if (!page
On Tue, Sep 3, 2013 at 9:41 AM, Jeff King wrote:
> On Mon, Sep 02, 2013 at 10:27:48PM -0400, Dale R. Worley wrote:
>
>> > I guess the "else" could and should be dropped. If you do so (and
>> > possibly insert a blank line between the DEFAULT_PAGER case and the
>> > "pager = NULL" case), you get a
Ramsay Jones writes:
> Signed-off-by: Ramsay Jones
> ---
>
> Hi Jens,
>
> commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
> from the commit message", 19-11-2013) in 'pu' fails the new test
> it added to t7507.
>
> I didn't spend too long looking at the problem, so take this patc
Signed-off-by: Ramsay Jones
---
Hi Jens,
commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
from the commit message", 19-11-2013) in 'pu' fails the new test
it added to t7507.
I didn't spend too long looking at the problem, so take this patch
as nothing more than a quick suggesti
W dniu 2013-11-20 13:03, Matthew Cengia pisze:
On 2013-11-20 08:20, Johannes Sixt wrote:
[...]
Not really. It's impossible to tell what's wrong if you
Hi Hannes,
Thanks for your response, and sorry for providing insufficient
information; this is a company Git repo (it's also about 200MB), so
On Fri, Jun 7, 2013 at 10:53 PM, Johannes Sixt wrote:
> MinGW's bash does not recognize an exit code -1 as failure. See also
> 47e3de0e (MinGW: truncate exit()'s argument to lowest 8 bits) and 2488df84
> (builtin run_command: do not exit with -1). Exit code 1 is good enough.
>
> Signed-off-by: Joh
Hej,
I think the patch went in and out in git.git, please see below.
(I coudn't the following in msysgit,
but if it was there, the clipped_write() for Windows could go away.
/Torsten
commit 0b6806b9e45c659d25b87fb5713c920a3081eac8
Author: Steffen Prohaska
Date: Tue Aug 20 08:43:54 2013 +0
Sigh, it seems replying from Gmail on my phone culled the CC-list.
Sorry about that, and here's the rest of the discussion in case
someone else is interested:
On Wed, Nov 20, 2013 at 1:38 PM, Andre Esser wrote:
> On 2013-11-20 12:23, Erik Faye-Lund wrote:
>> On Wed, Nov 20, 2013 at 12:59 PM, Andr
Am 11/20/2013 12:47, schrieb Alexander GQ Gerasiov:
> 1. I have repository with tree like this:
>
> dir1/
> file1
> file2
> file3
>
> dir2/
> subdir1/
> some files
>
>
> 2. Current branch is B.
>
> 3. I want to get dir1 from branch A, and save it's content
On 2013-11-20 13:29, Johannes Sixt wrote:
[...]
> That's strange. I can't tell what is going on. Perhaps you have some
> criss-cross merges in your history that merge-recursive trips over?
That's as good a guess as any, but I suspect tracking it down may
involve needles and haystacks...
>
> Sorr
Am 11/20/2013 13:03, schrieb Matthew Cengia:
> The only changes I expect are these:
>
> mattcen@sonar:prisonpc(wtf)$ git --no-pager diff --numstat --oneline
> \ "$(git merge-base wtf origin/22869-new-kernel)"
> origin/22869-new-kernel 37 0 client/kernel/README 2797
> 0 client/kern
On 2013-11-20 15:47, Alexander GQ Gerasiov wrote:
[...]
> So my question is
> How to put into index tree-object with known sha1 and given name?
I was just reading about something very similar in the Git book:
http://git-scm.com/book/en/Git-Internals-Git-Objects#Tree-Objects
(read the entire Tree O
On 2013-11-20 08:20, Johannes Sixt wrote:
[...]
> Not really. It's impossible to tell what's wrong if you
Hi Hannes,
Thanks for your response, and sorry for providing insufficient
information; this is a company Git repo (it's also about 200MB), so I've
got be careful what I post, but I can certai
On 2013-11-20 10:51, Erik Faye-Lund wrote:
> On Wed, May 29, 2013 at 4:16 PM, Andre Esser
> wrote:
>> Hello,
>>
>> When on a CIFS filesystem a git checkout does not replicate the executable
>> flag from the repository:
>>
>> $ git clone git://git/abettersqlplus
>> Cloning into 'abettersqlplus
Hello there.
I need to realize the following scenario with git.
1. I have repository with tree like this:
dir1/
file1
file2
file3
dir2/
subdir1/
some files
2. Current branch is B.
3. I want to get dir1 from branch A, and save it's content on cu
On Wed, May 29, 2013 at 4:16 PM, Andre Esser wrote:
> Hello,
>
> When on a CIFS filesystem a git checkout does not replicate the executable
> flag from the repository:
>
> $ git clone git://git/abettersqlplus
> Cloning into 'abettersqlplus'...
> remote: Counting objects: 522, done.
> remot
I know I'm extremely late to the party, and this patch has already
landed, but...
On Sat, May 11, 2013 at 1:05 AM, Junio C Hamano wrote:
> Filipe Cabecinhas writes:
>
>> Due to a bug in the Darwin kernel, write() calls have a maximum size of
>> INT_MAX bytes.
>>
>> This patch introduces a new co
44 matches
Mail list logo
