Junio C Hamano gits...@pobox.com writes:
@@ -559,8 +559,8 @@ core.whitespace::
* `space-before-tab` treats a space character that appears immediately
before a tab character in the initial indent part of the line as an
error (enabled by default).
-* `indent-with-non-tab` treats a line
On Sun, Sep 16, 2012 at 8:17 AM, Andrew Wong andrew.k...@gmail.com wrote:
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index fd535b0..da067ec 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -12,7 +12,7 @@ SYNOPSIS
[upstream]
Here's now my updated series of patches to make the win32 implementation of
poll() available to other platforms:
1 - make poll available for other platforms lacking it by moving it into a
separate directory and adjusting Makefile
2 - fix some win32 specific dependencies in poll.c by #ifdef the
Mischa POSLAWSKY g...@shiar.nl wrote:
... I would argue against diff options creating non-standard patches.
Seems to me it might depend on what one means by non-standard.
I can envision cases in which increasing the number of context lines
would result in the patch being more robust WRT
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 j...@schmitz-digital.de
---
Makefile | 20 +++-
In order for non-win32 platforms to be able to use poll.c, #ifdef the
inclusion of two header files in the same manner as it's done elsewhere
in git.
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
compat/poll/poll.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff
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. It got fixed in
gnulib
From: Joachim Schmitz [mailto:j...@schmitz-digital.de]
Sent: Saturday, September 15, 2012 7:15 PM
To: 'Junio C Hamano'
Cc: 'git@vger.kernel.org'
Subject: RE: What's cooking in git.git (Sep 2012, #05; Fri, 14)
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Saturday, September 15,
On 17/09/12 05:50, Junio C Hamano wrote:
Luke Diamandl...@diamand.org writes:
On 16/09/12 07:05, Junio C Hamano wrote:
Luke Diamandl...@diamand.org writes:
Looks good to me, ack.
Thanks; is this an ack for the entire series, or are you expecting
further back-and-forth with Pete before
Hi Eric et al,
Michael G. Schwern wrote:
Then later it can be canonicalized automatically rather than everywhere
its used.
Later patch will make other things use it.
Wow am I slow. I've finally got around to starting to parse these
patches to apply to a 1.7.10.y tree so they can
From: Michael G. Schwern schw...@pobox.com
Date: Fri, 27 Jul 2012 13:00:48 -0700
This patch only touches the simplest cases that simply read the
Git::SVN field rather than assigning to or applying a substitution to
it.
Code to change found by searching for the term {path}.
[jn: extracted from a
From: Michael G. Schwern schw...@pobox.com
Date: Fri, 27 Jul 2012 13:00:48 -0700
If some day the setter is taught to canonicalize paths, make sure the
path gets canonicalized at construction time, too.
[jn: split from a larger patch]
Signed-off-by: Eric Wong normalper...@yhbt.net
Signed-off-by:
Hi Enrico,
Repositories as old and large as ASF are the reason I created svn-fe.
git-svn is known to choke on these repositories.
If you have plenty of bandwidth, it might well be faster to:
* Grab an ASF archive (16GB)
* Use svn-fe to import the entire tree into git.
* Use a simple script to
Signed-off-by: Adam Spiers g...@adamspiers.org
---
builtin/check-attr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e1ff575..075d01d 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -9,7 +9,7 @@ static int
1. Change the color of individual known breakages from bold green to
bold yellow. This seems more appropriate when considering the
universal traffic lights coloring scheme, where green conveys the
impression that everything's OK, and amber that something's not
quite right.
2.
On Sun, Sep 16, 2012 at 3:13 PM, Ralf Thielow ralf.thie...@gmail.com wrote:
+ if (option_mirror || !option_bare) {
+ strbuf_reset(value);
I think we should use a new strbuf local variable here to avoid
resetting this. At least reviewers don't have to check if this
statememt
On 09/10/2012 10:56 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
diff --git a/fetch-pack.h b/fetch-pack.h
index 1dbe90f..a6a8a73 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -1,6 +1,8 @@
#ifndef FETCH_PACK_H
#define FETCH_PACK_H
+#include string-list.h
-Original Message-
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Friday, September 14, 2012 4:24 PM
To: Michael J Gruber
Cc: Johannes Sixt; Mestnik, Michael J - Eagan, MN -
Contractor; git@vger.kernel.org
Subject: Re: Using Format/export-subst Howto.
Michael J Gruber
On Sun, Sep 16, 2012 at 10:54:57PM -0700, Junio C Hamano wrote:
Yeah, popt.h it is. It is a bit distasteful that we have a build
dependency only to build test-* helper on something that we do not
even have runtime dependency on.
Perhaps this squash-in? It kills libpopt and removes the
On 09/11/2012 12:10 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
OK. As long as the sort order matches the order string-list
internally uses for its bisection search, it won't be a problem,
then.
The sorting is crucial but there is no bisection involved. The
Hi,
The following test in t1304-default-acl.sh fails for me on the latest master:
test_expect_success SETFACL 'Objects creation does not break ACLs with
restrictive umask' '
# SHA1 for empty blob
check_perms_and_acl
.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
'
It
-Original Message-
From: Michael J Gruber [mailto:g...@drmicha.warpmail.net]
Sent: Monday, September 17, 2012 9:21 AM
To: Mestnik, Michael J - Eagan, MN - Contractor
Cc: Junio C Hamano; Johannes Sixt; git@vger.kernel.org
Subject: Re: Using Format/export-subst Howto.
Mestnik,
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramkumar Ramachandra artag...@gmail.com writes:
Hi again,
Matthieu Moy wrote:
Does this user have the same UID as your usual user
(id kseygold; id $LOGNAME)?
Yes. What do you propose we do about the test?
On a GNU system, something
On Mon, Sep 17, 2012 at 07:55:24PM +0200, Johannes Sixt wrote:
Am 17.09.2012 19:44, schrieb Jeff King:
Oh, bleh. Stupid automatic --tee for valgrind. Try this:
SHELL=/usr/bin/zsh -x ./t-basic.sh --valgrind
I am also doing my tests with dash as my shell. You might try setting
Matthieu Moy wrote:
Junio C Hamano gits...@pobox.com writes:
I haven't been paying attention, but does that mean on that system,
a total stranger kseygold can write, modify, and remove whatever Ram
owns? I am hoping that is not the case.
I can see two reasons for having the same UID for two
mv: cannot stat `perl.mak': No such file or directory
mv: cannot move `perl.mak' to `perl.mak.old': No such file or directory
Writing perl.mak for Git
Writing MYMETA.yml
Writing perl.mak for Git
Writing MYMETA.yml
Writing perl.mak for Git
Writing MYMETA.yml
make[2]: *** [perl.mak] Error 1
make[1]:
After running git clone --single, the resulting repository has the
usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch
refspec installed, which means that a subsequent git fetch will
end up grabbing all the other branches.
Update the fetch refspec to cover only the singly cloned ref
On Sun, Sep 16, 2012 at 09:48:43PM +0200, Erik Faye-Lund wrote:
git-upload-pack: error while loading shared libraries: libiconv.so.2:
cannot open shared object file: No such file or directory
fatal: The remote end hung up unexpectedly
[...]
No. This is not a Git for Windows issue. The
Elia Pinto gitter.spi...@gmail.com writes:
- That 165 thing I mentioned earlier.
Thank you so much for the comments, that's fine. A single
consideration for MALLOC_PERTURB.
You can use any value between 1..255 for MALLOC_PERTURB_
That chooses the byte that glibc will use to memset all
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
I haven't been paying attention, but does that mean on that system,
a total stranger kseygold can write, modify, and remove whatever Ram
owns? I am hoping that is not the case.
I can see two reasons
If I had to guess, I'd say it was ssh, the library is installed in a
non-standard place (e.g., because he built them as a regular user and
put them in his home directory), and LD_LIBRARY_PATH does not get set
properly by ssh for the incoming ssh session.
This would be my guess as well. If
Ramkumar Ramachandra artag...@gmail.com writes:
Hi Paul,
Paul Wise wrote:
svn: there was a gsoc project for this but it was never merged:
http://git.wiki.kernel.org/index.php/SoC2011Projects#Remote_helper_for_Subversion_and_git-svn
I wouldn't give up on that yet. What is the status of
Adam Spiers g...@adamspiers.org writes:
Signed-off-by: Adam Spiers g...@adamspiers.org
---
builtin/check-attr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e1ff575..075d01d 100644
--- a/builtin/check-attr.c
+++
Adam Spiers g...@adamspiers.org writes:
1. Change the color of individual known breakages from bold green to
bold yellow. This seems more appropriate when considering the
universal traffic lights coloring scheme, where green conveys the
impression that everything's OK, and amber
Ramkumar Ramachandra artag...@gmail.com writes:
When tests were run without building git, the following error message
was displayed:
.: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS
Change this to display a more user-friendly error message:
error: you do not seem to
I really wanted to take a look at this series, but with the broken
patches I cannot.
Try again, please, perhaps first sending patches to yourself and
make sure they come out without losing leading SP for context lines
and such.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe
On Mon, Sep 17, 2012 at 10:18 PM, Junio C Hamano gits...@pobox.com wrote:
Ralf Thielow ralf.thie...@gmail.com writes:
- handle --mirror option (test added)
Handle how? I personally think erroring out is the right way to
handle it, but if we care about people who have been misusing the
Here's now my updated series of patches to make the win32 implementation of
poll() available to other platforms:
1 - make poll available for other platforms lacking it by moving it into a
separate directory and adjusting Makefile
2 - fix some win32 specific dependencies in poll.c by #ifdef the
Michael Haggerty mhag...@alum.mit.edu writes:
Junio pointed out that the sort order currently used by string_list
could be considered to be an implementation detail internal to
string_list. But the sort order is already visible to the outside
world (e.g., via iteration or via
In order for non-win32 platforms to be able to use poll.c, #ifdef the
inclusion of two header files properly
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
compat/poll/poll.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/compat/poll/poll.c
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. It got fixed
In gnulib in
Ramkumar Ramachandra artag...@gmail.com writes:
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/perf/.gitignore |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/perf/.gitignore b/t/perf/.gitignore
index 50f5cc1..0061cbc 100644
---
Ralf Thielow ralf.thie...@gmail.com writes:
- install correct refspec if the value of --branch is a tag (test added)
What is the definition of correct? I see the documentation says
--branch can also take tags and treat them like detached HEAD, and
even though I _think_ allowing tags was a
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
Avoid confusion in compound sentence about the start of the commit
set
and the depth measure. Use two sentences.
Dropping the first ',' after positive depth does not seem to make
it any easier to read (I
On Mon, Sep 17, 2012 at 03:10:07PM -0700, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
But how far should this policy be taken? It seems to me that strict
adherence to the policy would dictate that *.h files should *never*
include other git project files.
I
From: Junio C Hamano gits...@pobox.com
Matthieu Moy matthieu@grenoble-inp.fr writes:
Philip Oakley philipoak...@iee.org writes:
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -63,6 +63,12 @@ OPTIONS
Remove only files ignored by git. This may be useful to rebuild
Content-type: text/plain; charset=UTF-8 header should not appear
twice in the input, but it is always better to gracefully deal with
such a case. The current code concatenates the value to the values
we have seen previously, producing nonsense such as utf8UTF-8.
Instead of concatenating, forget
Joachim Schmitz j...@schmitz-digital.de writes:
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 j...@schmitz-digital.de
---
From: Junio C Hamano gits...@pobox.com
Philip Oakley philipoak...@iee.org writes:
Typically it will be placed in a MUA’s drafts folder, edited to add
timely commentary that should not go in the changelog after the three
dashes, and then sent as a message whose body, in our example, starts
with
Branches passed to 'git-svn init' via the -b/--branches flag
automatically had a /* appended to them. When the branch contained
a fancy glob with a {} pattern, this is incorrect behaviour, and
leads to odd branches being created in the git repository.
Signed-off-by: Ammon Riley
Philip Oakley philipoak...@iee.org writes:
I then applied it (using git am) to a temp branch to see what it
produced, and could repeat the cycle until the patches looked right.
That's another obvious and valid way to prepare your series. It all
depends on how comfortable you are to directly
Jeff King p...@peff.net writes:
On Mon, Sep 17, 2012 at 04:49:39PM -0700, Junio C Hamano wrote:
However, when it came to creating the series, with comments, I
couldn't see a way of having my comments within my local commits, but
preparing a patch series that would properly include the
On Tue, Sep 18, 2012 at 3:08 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyen Thai Ngoc Duy pclo...@gmail.com writes:
--mirror --single-branch combination does not look right. The heads/
part is missing..
What does it supposed to do in the first place? mirror is
primarily about grabbing
Made the fixes as suggested by Martin.
Martin: Good points. Thanks!
Andrew Wong (3):
rebase -i: Refactor help messages for todo file
rebase -i: Teach --edit-todo action
rebase -i: Add tests for --edit-todo
Martin von Zweigbergk (1):
rebase usage: subcommands can not be combined with -i
From: Martin von Zweigbergk martinv...@gmail.com
Since 95135b0 (rebase: stricter check of standalone sub command,
2011-02-06), git-rebase has not allowed to use -i together with e.g.
--continue. Yet, when rebase started using OPTIONS_SPEC in 45e2acf
(rebase: define options in OPTIONS_SPEC,
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
---
Hello,
Is there any nice way to get a diff and/or diffstat of both a project and its
submodules between two revisions of the main project?
Something like 'git diff --stat tag_a tag_b' but also including the diffstat on
the submodule from the revision tied to in tag_a to the revision tied to
On Mon, Sep 17, 2012 at 10:23 PM, Andrew Wong andrew.k...@gmail.com wrote:
On 09/18/12 00:58, Martin von Zweigbergk wrote:
On Mon, Sep 17, 2012 at 6:28 PM, Andrew Wong andrew.k...@gmail.com wrote:
+ test M = $(git cat-file commit HEAD^ | sed -ne \$p)
+ test L = $(git cat-file
58 matches
Mail list logo
