On Thu, Feb 26, 2015 at 12:13 PM, Junio C Hamano wrote:
>
> I agree with the value assessment of these patches 98%, but these
> bits can be taken as the "we have v2 server availble for you on the
> side, by the way" hint you mentioned in the older thread, I think.
The patches are not well polish
The rename code cannot handle an input where we have
duplicate destinations (i.e., more than one diff_filepair in
the queue with the same string in its pair->two->path). We
end up allocating only one slot in the rename_dst mapping.
If we fill in the diff_filepair for that slot, when we
re-queue the
This function manages the mapping of destination pathnames
to filepairs, and it handles both insertion and lookup. This
makes the return value a bit confusing, as we return a newly
created entry (even though no caller cares), and have no
room to indicate to the caller that an entry already
existed.
On Wed, Feb 25, 2015 at 01:50:38PM -0800, Junio C Hamano wrote:
> > So to go forward, I'm happy to prepare a patch, but I'd like to know:
> >
> > 1. Does something like the above look reasonable to you (I'd probably
> > refactor it to avoid the bizarre return value semantics from
> > l
On Thu, Feb 26, 2015 at 12:13 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> Step 1 then should be identifying these wrongdoings and assumptions.
>>
>> We can really go wild with these capabilities. The only thing that
>> can't be changed is perhaps sending the first ref. I don't know
>> whe
Hey,
It would be nice if git-add could be told to ignore whitespace
changes, wouldn't it?
According to SO, I am not the one to think so:
http://stackoverflow.com/questions/3515597/git-add-only-non-whitespace-changes
A change to add--interactive would be as simple as adding the diff -b
or -w opti
Mason writes:
>> Mason wrote:
>>
>>> I was planning to write 'git diff -q commit^ commit'
>>> to test for empty commits.
>>
>> s/-q/--quiet/ and all is well, no?
>
> Doh! I've no idea how I missed these...
Yeah, this is one of the unfortunate corners of Git that I can
apologize but cannot do m
"Kyle J. McKay" writes:
>> After finishing 2.3.0 release, at some point while 'master' is still
>> at 2.3.0, something like this would happen:
>>
>>$ git branch -m maint maint-2.2
>>$ git branch maint master
>
> So the reason I don't notice force-updates to maint when this happens
> is be
Junio C Hamano wrote:
> Mason wrote:
>
>> I was planning to write 'git diff -q commit^ commit'
>> to test for empty commits.
>
> s/-q/--quiet/ and all is well, no?
Doh! I've no idea how I missed these...
--exit-code
Make the program exit with codes similar to diff(1). That is, it
exits wit
On Feb 26, 2015, at 12:54, Junio C Hamano wrote:
"Kyle J. McKay" writes:
I would like to better understand how the various heads are
maintained. I've read MaintNotes and I've got the concepts, but I'm
still a little fuzzy on some details. It looks to me like all topics
still only in pu afte
Jeff King writes:
> On Thu, Feb 26, 2015 at 05:36:03PM -0500, Jeff King wrote:
>
>> > [-Wstrict-prototypes]
>> > const char *get_preferred_languages();
>> > ^
>>
>> Hmph. The compiler is right that it should be:
>>
>> const char *get_preferred_languages(void);
>>
>> but my gcc (4.9.2, with
Hey.
Short question:
I saw that when plain git (i.e. git://) is used, the client tells the
server the hostname specified on the client side.
For http one has the same automatically via http's Host: header.
But after watching the git's over-ssh protocol, I couldn't find anything
like that there?
On Thu, Feb 26, 2015 at 05:36:03PM -0500, Jeff King wrote:
> > [-Wstrict-prototypes]
> > const char *get_preferred_languages();
> > ^
>
> Hmph. The compiler is right that it should be:
>
> const char *get_preferred_languages(void);
>
> but my gcc (4.9.2, with -Wstrict_prototypes) does not se
On Thu, Feb 26, 2015 at 02:26:05PM -0800, Stefan Beller wrote:
> On Thu, Feb 26, 2015 at 2:07 PM, Jeff King wrote:
> >
> > Here it is, with the commit message and the missing hunk. This works for
> > me both with and without NO_GETTEXT defined.
>
> This compiles here though a warning is spit:
>
On Thu, Feb 26, 2015 at 2:07 PM, Jeff King wrote:
>
> Here it is, with the commit message and the missing hunk. This works for
> me both with and without NO_GETTEXT defined.
This compiles here though a warning is spit:
In file included from cache.h:8:0,
from userdiff.c:1:
gettext
Jeff King writes:
> On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote:
>
>> On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano wrote:>
>> > Here is what I queued. Thanks.
>>
>> I did not follow the thread if there are any intermediate patches,
>> though it applied cleanly.
>
> What Ju
On Thu, Feb 26, 2015 at 05:06:10PM -0500, Jeff King wrote:
> On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote:
>
> > On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano wrote:>
> > > Here is what I queued. Thanks.
> >
> > I did not follow the thread if there are any intermediate patch
Eric Wong writes:
> Hi Junio, mainly bugfixes but a tiny amount of progress on lazy-loading.
> The bugfixes from Kyle and Ryuichi should also be applied to maint.
I think you mean "cherry-picked". Let me try to rearrange them by
doing the following:
0. Grab your stuff.
$ git fetch git://b
On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote:
> On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano wrote:>
> > Here is what I queued. Thanks.
>
> I did not follow the thread if there are any intermediate patches,
> though it applied cleanly.
What Junio posted is missing the hunk
On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano wrote:>
> Here is what I queued. Thanks.
I did not follow the thread if there are any intermediate patches,
though it applied cleanly.
Applying this on top of f18604bbf2c391c689a41fca14cbaeff5e106255
(http: add Accept-Language header if possible)
Jeff King writes:
> On Thu, Feb 26, 2015 at 12:59:56PM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > Perhaps it would be less risky to stick get_preferred_languages() into
>> > gettext.c, like the patch below. Then we do not have to worry about
>> > locale.h introducing other disr
Виталий Бормотов writes:
> When checking out into some different
> state, if there is no permissions to unlink files (if some files in
> the current state doesn't exist in the new) warnings are outputing,
> but then git says that checking out is successful, shows that we are
> in the new state a
Hi Junio, mainly bugfixes but a tiny amount of progress on lazy-loading.
The bugfixes from Kyle and Ryuichi should also be applied to maint.
Thanks.
The following changes since commit 7f4ba4b6e3ba7075ca6b379ba23fd3088cbe69a8:
Post 2.3 cyle (batch #5) (2015-02-25 15:44:04 -0800)
are available i
On Thu, Feb 26, 2015 at 12:59:56PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > Perhaps it would be less risky to stick get_preferred_languages() into
> > gettext.c, like the patch below. Then we do not have to worry about
> > locale.h introducing other disruptive includes. The functio
Mason writes:
>> Not just passing
>> these options, the code in "git am" to react to the result of patch
>> application to avoid the issue you observed when these options are
>> passed need to be adjusted by changes that started passing them, but
>> I do not think they did, cf. 77e9e496 (am: pass
"Kyle J. McKay" wrote:
> The updated patch with the additional fix is below.
Thanks, signed-off and pushed to master on git://bogomips.org/git-svn
I've dropped my "destroy all tempfiles..." patch.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord
Jeff King writes:
> Perhaps it would be less risky to stick get_preferred_languages() into
> gettext.c, like the patch below. Then we do not have to worry about
> locale.h introducing other disruptive includes. The function is not
> technically about gettext, but it seems reasonable to me to stuf
Michael J Gruber writes:
> So, as a summary of the discussion, it seems it's time to switch the
> default to --textconv for git grep?
Hmmm, why?
Nobody seems to be asking for such a change in this thread. The
original issue IIRC was that the grep output was unnecessary for
some paths and the r
Hi,
Stefan Beller wrote:
> On Post 2.3 cyle (batch #5) (v2.3.1-167-g7f4ba4b)
>
> CC http.o
> http.c: In function 'get_preferred_languages':
> http.c:1021:2: warning: implicit declaration of function 'setlocale'
> [-Wimplicit-function-declaration]
> retval = setlocale(LC_MESSAGES, NULL);
>
> On Thu, Feb 26, 2015 at 12:48 PM, Stefan Beller wrote:
>> On Post 2.3 cyle (batch #5) (v2.3.1-167-g7f4ba4b)
>>
>> CC http.o
>> http.c: In function 'get_preferred_languages':
>> http.c:1021:2: warning: implicit declaration of function 'setlocale'
>> [-Wimplicit-function-declaration]
>> retv
"Kyle J. McKay" writes:
> I would like to better understand how the various heads are
> maintained. I've read MaintNotes and I've got the concepts, but I'm
> still a little fuzzy on some details. It looks to me like all topics
> still only in pu after master has been updated are then rebased on
Removing config.mak makes it compile again.
config.mak contained:
CFLAGS += -Wall -g -rdynamic -O0
# CFLAGS += -Wextra
# CFLAGS += -Werror
CFLAGS += -Wno-format-zero-length
CFLAGS += -Wdeclaration-after-statement
CFLAGS += -Wpointer-arith
CFLAGS += -Wstrict-prototypes
CFLAGS += -Wold-style-declarat
On Post 2.3 cyle (batch #5) (v2.3.1-167-g7f4ba4b)
CC http.o
http.c: In function 'get_preferred_languages':
http.c:1021:2: warning: implicit declaration of function 'setlocale'
[-Wimplicit-function-declaration]
retval = setlocale(LC_MESSAGES, NULL);
^
http.c:1021:21: error: 'LC_MESSAGES' un
Junio C Hamano wrote:
> Mason wrote:
>
>> I fetched linux-stable.git inside our repo.
>> I created ~300 patches using git format-patch -1 in a loop.
>> I can now run 'git am --3way $IGNORE *.patch'
>>
>> IGNORE is used to --exclude the directories I'm not interested in.
>>
>> Note: it seems --exc
Duy Nguyen writes:
> Step 1 then should be identifying these wrongdoings and assumptions.
>
> We can really go wild with these capabilities. The only thing that
> can't be changed is perhaps sending the first ref. I don't know
> whether we can accept a dummy first ref... After that point, you can
Hello. Thanks for the git, it is powerful, fast and nice to use.
I've probably found a bug. When checking out into some different state, if
there is no permissions to unlink files (if some files in the current state
doesn't exist in the new) warnings are outputing, but then git says that
checki
On Thu, Feb 26, 2015 at 2:15 AM, Duy Nguyen wrote:
> On Thu, Feb 26, 2015 at 2:31 PM, Stefan Beller wrote:
>> On Wed, Feb 25, 2015 at 10:04 AM, Junio C Hamano wrote:
>>> Duy Nguyen writes:
>>>
On Wed, Feb 25, 2015 at 6:37 AM, Stefan Beller wrote:
> I can understand, that we maybe want
Michael J Gruber writes:
> Hmm. With "--edit", current config being in effect should be expected,
> right? So how about:
>
> In case of no conflict: force cleanup=verbatim unless --edit is used?
Perhaps something like that.
Stepping back a bit and imagine a world where the sole purpose of
cherr
Mason writes:
> Thanks! At least now, I see the light at the end of the tunnel.
>
> I fetched linux-stable.git inside our repo.
> I created ~300 patches using git format-patch -1 in a loop.
> I can now run 'git am --3way $IGNORE *.patch'
>
> IGNORE is used to --exclude the directories I'm not int
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Fifth batch of topics have been merged to 'master', including both
fixes and enhancements. First maintenance release for v2.3 was cut
with many
Thomas Klausner writes:
> I've played around with git and found that 'git mv' does not honor
> what I tell it to do:
>
> wiz@yt:~> mkdir a
> wiz@yt:~> cd a
> wiz@yt:~/a> git init .
> Initialized empty Git repository in /home/wiz/a/.git/
> wiz@yt:~/a> touch a
> wiz@yt:~/a> git add a
> wiz@yt:~/a>
Thomas Klausner venit, vidit, dixit 26.02.2015 15:58:
> On Thu, Feb 26, 2015 at 03:45:13PM +0100, Michael J Gruber wrote:
>> Thomas Klausner venit, vidit, dixit 26.02.2015 15:12:
>>> Hi!
>>>
>>> I've played around with git and found that 'git mv' does not honor
>>> what I tell it to do:
>>>
>>> wiz
On Wed, 2015-02-25 at 16:55 -0500, Eric Sunshine wrote:
> I had written a longer review but was interrupted for a several hours,
> and upon returning found that David and Junio covered many of the same
> issues or overrode comments I was making, so the below review is pared
> down quite a bit. Juni
On Thu, Feb 26, 2015 at 03:45:13PM +0100, Michael J Gruber wrote:
> Thomas Klausner venit, vidit, dixit 26.02.2015 15:12:
> > Hi!
> >
> > I've played around with git and found that 'git mv' does not honor
> > what I tell it to do:
> >
> > wiz@yt:~> mkdir a
> > wiz@yt:~> cd a
> > wiz@yt:~/a> git i
Thomas Klausner venit, vidit, dixit 26.02.2015 15:12:
> Hi!
>
> I've played around with git and found that 'git mv' does not honor
> what I tell it to do:
>
> wiz@yt:~> mkdir a
> wiz@yt:~> cd a
> wiz@yt:~/a> git init .
> Initialized empty Git repository in /home/wiz/a/.git/
> wiz@yt:~/a> touch a
Hi!
I've played around with git and found that 'git mv' does not honor
what I tell it to do:
wiz@yt:~> mkdir a
wiz@yt:~> cd a
wiz@yt:~/a> git init .
Initialized empty Git repository in /home/wiz/a/.git/
wiz@yt:~/a> touch a
wiz@yt:~/a> git add a
wiz@yt:~/a> git commit -m 'add a'
[master (root-comm
On Thu 26-02-15 14:35:34, Michal Hocko wrote:
> Hi,
> I have just encountered an old kernel git commit:
> commit c854363e80b49dd04a4de18ebc379eb8c8806674
> Author: Dave Chinner
> Date: Sat Feb 6 12:39:36 2010 +1100
>
> xfs: Use delayed write for inodes rather than async V2
> [...]
OK, I'v
On Feb 26, 2015, at 01:09, Nico Schl=F6mer wrote:
> All,
>
> I applied Kyle's latest patch
>
>> diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
>> index 622535e2..96888228 100644
>> --- a/perl/Git/SVN/Ra.pm
>> +++ b/perl/Git/SVN/Ra.pm
>> @@ -391,6 +391,7 @@ sub longest_common_path {
>> sub gs_
Hi,
I have just encountered an old kernel git commit:
commit c854363e80b49dd04a4de18ebc379eb8c8806674
Author: Dave Chinner
Date: Sat Feb 6 12:39:36 2010 +1100
xfs: Use delayed write for inodes rather than async V2
[...]
which cannot be described properly:
$ git describe --contains c854363e
This is needed in build automation where the tree really needs to
be reset to known state.
Signed-off-by: Mikko Rapeli
---
Documentation/git-clean.txt |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 94
On Thu, Feb 19, 2015 at 2:14 AM, Jeff King wrote:
> Where I really need help now is in the "ideas" page:
>
> http://git.github.io/SoC-2015-Ideas.html
Is this too ambitious for a summer? I suspect the answer is yes, but anyway..
Due to http limitations and stateless decision, a lot of data is s
On Thu, Feb 26, 2015 at 02:56:40PM +0200, Mikko Rapeli wrote:
> This is needed in build automation where the tree really needs to
> be reset to known state.
>
> Signed-off-by: Mikko Rapeli
> ---
> Documentation/git-clean.txt |8 ++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>
This is needed in build automation where the tree really needs to
be reset to known state.
Signed-off-by: Mikko Rapeli
---
Documentation/git-clean.txt |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 94
This is needed in build automation where the tree really needs to
be reset to known state.
Signed-off-by: Mikko Rapeli
---
Documentation/git-clean.txt |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 94
On Thu, Feb 26, 2015 at 6:16 PM, Michael J Gruber
wrote:
> So, as a summary of the discussion, it seems it's time to switch the
> default to --textconv for git grep?
Either that or make it clearer in git-grep.txt about this diff
attribute. It takes me some time to make the connection after readin
Junio C Hamano wrote:
But I personally think "git am -3" may be easier to handle.
Thanks! At least now, I see the light at the end of the tunnel.
I fetched linux-stable.git inside our repo.
I created ~300 patches using git format-patch -1 in a loop.
I can now run 'git am --3way $IGNORE *.patc
Jeff King venit, vidit, dixit 25.02.2015 20:11:
> On Wed, Feb 25, 2015 at 11:01:22AM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>>> So I think _if_ using "diff" attributes is enough for this purpose, then
>>> there is no code to be written. But if somebody wants to draw a
>>> distinc
Junio C Hamano venit, vidit, dixit 25.02.2015 19:22:
> Michael J Gruber writes:
>
>> Junio C Hamano venit, vidit, dixit 24.02.2015 19:29:
>>> Michael J Gruber writes:
>>>
> Hmm, wouldn't it introduce a grave regression for users who
> explicitly ask to clean crufty messages up (by settin
Once we know the number of objects in the input pack, we allocate an
array of nr_objects of struct delta_entry. On x86-64, this struct is
32 bytes long. The union delta_base, which is part of struct
delta_entry, provides enough space to store either ofs-delta (8 bytes)
or ref-delta (20 bytes).
Not
This fixes the "signed char" bug in 1/2: "char" alone could be either
signed or unsigned but we do need signed char.
One point to clang for detecting "obj->real_type != OBJ_BAD" on ARM
where real_type becomes unsigned char and OBJ_BAD is -1. gcc just
keeps quiet..
Nguyễn Thái Ngọc Duy (2):
inde
For each object in the input pack, we need one struct object_entry. On
x86-64, this struct is 64 bytes long. Although:
- The 8 bytes for delta_depth and base_object_no are only useful when
show_stat is set. And it's never set unless someone is debugging.
- The three fields hdr_size, type and
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Second round. Looking better. We can do
"1.0-pre12 < 1.0-rc0 < 1.0 < 1.0-post1" too but it relies on
config key's loading order, a bit iffy.
Documentation/config.txt | 7 +++
t/t7004-tag.sh | 28 +++
versioncmp.c
On Thu, Feb 26, 2015 at 2:31 PM, Stefan Beller wrote:
> On Wed, Feb 25, 2015 at 10:04 AM, Junio C Hamano wrote:
>> Duy Nguyen writes:
>>
>>> On Wed, Feb 25, 2015 at 6:37 AM, Stefan Beller wrote:
I can understand, that we maybe want to just provide one generic
"version 2" of the protoc
All,
I applied Kyle's latest patch
> diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
> index 622535e2..96888228 100644
> --- a/perl/Git/SVN/Ra.pm
> +++ b/perl/Git/SVN/Ra.pm
> @@ -391,6 +391,7 @@ sub longest_common_path {
> sub gs_fetch_loop_common {
> my ($self, $base, $head, $gsv, $
64 matches
Mail list logo
