On 28/04/2013 02:02, Junio C Hamano wrote:
Kevin Bracey writes:
In the event of an odd merge, we may find ourselves TREESAME to
apparently redundant parents. Prevent simplify_merges() from removing
every TREESAME parent - in the event of such a merge it's useful to see
where we came actually f
On 28/04/2013 01:36, Junio C Hamano wrote:
Kevin Bracey writes:
Historically TREESAME was set on a commit if it was TREESAME to _any_ of
its parents. This is not optimal, as such a merge could still be worth
showing, particularly if it is an odd "-s ours" merge that (possibly
accidentally) dro
When --stdlayout and --preserve-empty-dirs flags are used and a
directory becomes empty, sometimes no empty dir placeholder file
created. Then on fetch next commit git-svn dies with "Failed to strip
path" error.
Test script:
rm -rf testrepo.svn testrepo.gitsvn
svnadmin create testrepo.svn
The Fetcher accumulates deleted paths in an array and doesn't reset the
array on next commit. This causes different results when interrupting
and resuming the fetch.
When --preserve-empty-dirs flag is used, a path in the array can be
erroneously treated as just deleted, although it was deleted in t
Ilya Basin writes:
>
You should Cc Eric on git-svn related patches.
> Test script:
>
> rm -rf testrepo.svn testrepo.gitsvn
> svnadmin create testrepo.svn
> url=file://`pwd`/testrepo.svn
>
> svn mkdir -m "" "$url/trunk" "$url/branches" "$url/tags"
> rm -rf testrepo
> svn c
On Sat, 23 Mar 2013 16:32:47 +, Ben Walton
wrote:
> Hello,
Still failing in 1.8.2.2
Short fix:
--8<---
diff --git a/perl/Git.pm b/perl/Git.pm
index dc48159..7a252ef 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1265,7 +1265,7 @@ sub _temp_cache {
$tmpdir = $self->re
On 2013-04-28 08.02, Torsten Bögershausen wrote:
> On 2013-04-27 20.42, Ramsay Jones wrote:
>>
>> On MinGW, sparse issues an "'get_st_mode_bits' not declared. Should
>> it be static?" warning. The MinGW and MSVC builds do not see the
>> declaration of this function, within git-compat-util.h, due to
The inverted meaning of {ours,theirs} for rebase could be very
confusing to some, especially to new uses, for me every time I
merge/rebase I need to think about it to make sure I've made it right.
What about making it more intuitive?
We can and a new option (like '-P') for people to specify the
p
I originally posted this as a question about getting `git log` to
output the same thing that `git describe` does to the git-users
mailing list, and was directed here. The actual thing I want to do is
something like this:
static const char *project_version = "$Format:...$";
where "..." is someth
Kevin Bracey writes:
>> Could you explain here a bit more the reason why we do not want to
>> remove them and why "-s ours" is so significant that it deserves to
>> be singled out? And why randomly picking one that is redundant
>> (because it is an ancestor of some other parent) is an improvemen
Kevin Bracey writes:
>> Do we want to discard the decoration data when the commit becomes a
>> non-merge?
>
> Would seem reasonable, and would also help make concrete why we update
> TREESAME immediately, and not in update_treesame(), but I didn't spot
> a mechanism to discard decoration. I'll re
Junio C Hamano writes:
> Felipe Contreras writes:
>
>> And in case anybody is thinking that remote-bzr is really a too fast
>> moving target; even if this managed to land in 'master', it's likely
>> that people were not able to push at all, and in fact, many were not
>> even able to clone in 1.8
Felipe Contreras writes:
> On Wed, Apr 24, 2013 at 2:49 PM, Ramkumar Ramachandra
> wrote:
>> Ramkumar Ramachandra wrote:
>>> [...]
>>
>> Any updates on this?
>
> FWIW they all look OK to me.
I do not have the original series, so a resend with Felipe's Acked-by
after your original Sign-off would
Thanks, both.
--
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
Ramsay Jones writes:
> On MinGW, sparse issues an "'get_st_mode_bits' not declared. Should
> it be static?" warning. The MinGW and MSVC builds do not see the
> declaration of this function, within git-compat-util.h, due to it's
> placement within an preprocessor conditional. (So, one solution wou
Hi,
I have a weird problem that seems to manifest itself only on ZFS
(actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way.
I just switched to ZFS, so I can't blame that particular version of git.
"Sometimes" (I'd say something like 10-15% of the time, fairly
reproducible anyway),
Felipe Contreras writes:
> We don't need to quote the filename to pass to the command, we can use
> an array of all the arguments to pass to the command, which is safer,
> and more extensible.
>
> Commit a47eab0 (send-email: use the three-arg form of open in
> recipients_cmd) stated we couldn't p
Ramsay Jones writes:
> On linux, when the build variable USE_NED_ALLOCATOR is set, gcc
> issues the following warnings:
>
> In file included from compat/nedmalloc/nedmalloc.c:63:
> .../malloc.c.h: In function 'mmap_resize':
> .../malloc.c.h:3762: warning: implicit declaration of funct
René Scharfe writes:
> Why not take the opposite direction with a patch like this?
> ...
> diff --git a/compat/mingw.h b/compat/mingw.h
> index 389ae01..74e7b87 100644
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -452,11 +452,11 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t
> utfl
Yann Hodique writes:
> I have a weird problem that seems to manifest itself only on ZFS
> (actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way.
> I just switched to ZFS, so I can't blame that particular version of git.
>
> "Sometimes" (I'd say something like 10-15% of the time, f
> "Thomas" == Thomas Rast writes:
> Yann Hodique writes:
>> I have a weird problem that seems to manifest itself only on ZFS
>> (actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way.
>> I just switched to ZFS, so I can't blame that particular version of git.
>>
>> "Sometimes
When --stdlayout and --preserve-empty-dirs flags are used and a
directory becomes empty, two things happen:
Sometimes find_empty_directories() returns empty list and no empty dir
placeholder file created. This happens, because find_empty_directories()
marks all directories as non-empty, if at leas
On Sun, Apr 28, 2013 at 3:11 PM, Yann Hodique wrote:
> Hi,
>
> I have a weird problem that seems to manifest itself only on ZFS
> (actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way.
> I just switched to ZFS, so I can't blame that particular version of git.
>
> "Sometimes" (I'd s
In the previous commit a showcase was added to
t9160-git-svn-preserve-empty-dirs.sh for the "Failed to strip path" bug.
Now the flag --stdlayout should be enough.
---
t/t9160-git-svn-preserve-empty-dirs.sh | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/t/t916
The Fetcher accumulates deleted paths in an array and doesn't reset the
array on next commit. This causes different results when interrupting
and resuming the fetch.
When --preserve-empty-dirs flag is used, a path in the array can be
erroneously treated as just deleted (although it was deleted in t
> "John" == John Szakmeister writes:
> On Sun, Apr 28, 2013 at 3:11 PM, Yann Hodique wrote:
>> Hi,
>>
>> I have a weird problem that seems to manifest itself only on ZFS
>> (actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way.
>> I just switched to ZFS, so I can't blame tha
Michael Haggerty writes:
> On 04/27/2013 04:24 AM, shawn wilson wrote:
>> On Fri, Apr 26, 2013 at 8:22 PM, Junio C Hamano wrote:
>>
>>> * There was no good way to ask "I have a random string that came from
>>>outside world. I want to turn it into a 40-hex object name while
>>>making su
John Gallagher writes:
> The actual thing I want to do is
> something like this:
>
> static const char *project_version = "$Format:...$";
>
> where "..." is something that `git archive` will replace with the
> output of `git describe`,...
You need to find an appropriate pair of placeholders th
Yann Hodique writes:
> $ git checkout next; git diff-files; git checkout next; git diff-files
> Already on 'next'
> :100644 100644 bd774cccaa14e061c3c26996567ee28f4f77ec80
> Mmagit.el
> Already on 'next'
> $
If you run "git update-index --refresh" be
Junio C Hamano writes:
> John Gallagher writes:
>
>> The actual thing I want to do is
>> something like this:
>>
>> static const char *project_version = "$Format:...$";
>>
>> where "..." is something that `git archive` will replace with the
>> output of `git describe`,...
>
> You need to find
On Sun, Apr 28, 2013 at 11:09:33AM +0200, H.Merijn Brand wrote:
> Still failing in 1.8.2.2
>
> Short fix:
> --8<---
> diff --git a/perl/Git.pm b/perl/Git.pm
> index dc48159..7a252ef 100644
> --- a/perl/Git.pm
> +++ b/perl/Git.pm
> @@ -1265,7 +1265,7 @@ sub _temp_cache {
>
Michael Heemskerk writes:
> Re-sent to the mailing list because the original was bounced (HTML subpart):
> ...
>
> With the patch applied, the server ignores the shallow line mentioned by
> the server and will not send a "shallow" or "unshallow" line for it back to
> the client. This scenario is
John Keeping writes:
> On Fri, Apr 26, 2013 at 05:22:22PM -0700, Junio C Hamano wrote:
>> * "git difftool" allows the user to write into the temporary files
>>being shown; if the user makes changes to the working tree at the
>>same time, one of the changes has to be lost in such a case,
ryenus writes:
> The inverted meaning of {ours,theirs} for rebase could be very
> confusing to some, especially to new uses, for me every time I
> merge/rebase I need to think about it to make sure I've made it right.
The key point to remember is "git rebase origin master" is *not*
about integra
Jeff King writes:
> On Sun, Apr 28, 2013 at 11:09:33AM +0200, H.Merijn Brand wrote:
>
>> Still failing in 1.8.2.2
>>
>> Short fix:
>> --8<---
>> diff --git a/perl/Git.pm b/perl/Git.pm
>> index dc48159..7a252ef 100644
>> --- a/perl/Git.pm
>> +++ b/perl/Git.pm
>> @@ -1265,7 +1265,7 @@ sub _temp_ca
On Sun, Apr 28, 2013 at 1:47 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Felipe Contreras writes:
>>
>>> And in case anybody is thinking that remote-bzr is really a too fast
>>> moving target; even if this managed to land in 'master', it's likely
>>> that people were not able to push
On Sun, Apr 28, 2013 at 1:48 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Wed, Apr 24, 2013 at 2:49 PM, Ramkumar Ramachandra
>> wrote:
>>> Ramkumar Ramachandra wrote:
[...]
>>>
>>> Any updates on this?
>>
>> FWIW they all look OK to me.
>
> I do not have the original series,
Hi,
Ramsay Jones wrote:
> --- a/compat/nedmalloc/malloc.c.h
> +++ b/compat/nedmalloc/malloc.c.h
> @@ -484,6 +484,10 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not
> HAVE_MMAP
> #define DLMALLOC_VERSION 20804
> #endif /* DLMALLOC_VERSION */
>
> +#if defined(linux)
> +#define _GNU_SOURCE
Ramsay Jones wrote:
> After this change, it should be possible to drop the
> CYGWIN_V15_WIN32API setting without any negative effect.
>
> [rj: %s/NATIVE_WINDOWS/GIT_NATIVE_WINDOWS/g ]
>
> Signed-off-by: Jonathan Nieder
> Signed-off-by: Ramsay Jones
Yay! Thanks for finishing it.
For what it's
On Sun, Apr 28, 2013 at 2:18 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> We don't need to quote the filename to pass to the command, we can use
>> an array of all the arguments to pass to the command, which is safer,
>> and more extensible.
>>
>> Commit a47eab0 (send-email: use the
Hello,
I have been working on some of the following utilities for working
with submodules:
* git-submodule-ext - Experimental extensions to git-submodule.
Includes 'foreach' with --top-level, --post-order, and --constrain
options. (Been using this to prototype patches for git-submodule)
* git-new
Felipe Contreras writes:
>> open $fh, "-|", qw(sh -c), $cmd, @args
>
> That doesn't seem to work for me.
My fault. It needs to form a command line like this:
sh -c 'cccmd --frotz --nitfol "$@"' - a r g s
[jc: goes and tries
$ sh -c 'echo X Y "$@"' - a r g s
X Y
Junio C Hamano writes:
> OK, the change the patch text shows looks sensible to me. Can you
> resend it in full, with the log message, your sign-off, and Duy's
> "Reviewed-by:", so that it can be applied?
I managed to reassemble what I _think_ is close to the original from
a few messages by dequ
On Mon, Apr 29, 2013 at 12:24 AM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>>> open $fh, "-|", qw(sh -c), $cmd, @args
>>
>> That doesn't seem to work for me.
>
> My fault. It needs to form a command line like this:
>
> sh -c 'cccmd --frotz --nitfol "$@"' - a r g s
>
> [
Thanks Junio,
That looks fine to me. I'll try to find some time this week to create a
follow-up patch for removing pruned commits from the shallow file as
well.
Cheers,
Michael
On 29 April 2013 15:32, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> OK, the change the patch text shows looks
Jonathan Nieder writes:
> Ramsay Jones wrote:
>
>> After this change, it should be possible to drop the
>> CYGWIN_V15_WIN32API setting without any negative effect.
>>
>> [rj: %s/NATIVE_WINDOWS/GIT_NATIVE_WINDOWS/g ]
>>
>> Signed-off-by: Jonathan Nieder
>> Signed-off-by: Ramsay Jones
>
> Yay! T
On Sun, 28 Apr 2013 20:59:16 -0700, Junio C Hamano
wrote:
> Jeff King writes:
>
> > On Sun, Apr 28, 2013 at 11:09:33AM +0200, H.Merijn Brand wrote:
> >
> >> Still failing in 1.8.2.2
> >>
> >> Short fix:
> >> --8<---
> >> diff --git a/perl/Git.pm b/perl/Git.pm
> >> index dc48159..7a252ef 100644
"H.Merijn Brand" writes:
> I don't need any credits. I just want git to work from scratch :)
The sign-off procedure is not about giving credits to you. It is to
protect us from others (e.g. your employer) by having a record that
you claimed that you had the authority to give us the change.
For
Hi,
Ramsay Jones wrote:
> Signed-off-by: Ramsay Jones
Let me try to understand this.
Before v1.8.1.1~7^2~2 (Update cygwin.c for new mingw-64 win32 api
headers, 2012-11-11), compat/cygwin.c did
#define CYGWIN_C
#define WIN32_LEAN_AND_MEAN
#include "../git-compat-util.h
49 matches
Mail list logo
