Re: [PATCH 2/3] rebase -i: Teach "--edit-todo" action

2012-09-17 Thread Junio C Hamano
Andrew Wong writes: > On 09/16/12 02:54, Junio C Hamano wrote: >> In any case, what information are you discarding and then replacing >> with the standard boilerplate? > It's to strip out the comment that says: > > # However, if you remove everything, the rebase will be aborted. > > As there'

Re: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-17 Thread Junio C Hamano
"Joachim Schmitz" writes: >> > @@ -1605,6 +1610,11 @@ ifdef NO_GETTEXT >> >BASIC_CFLAGS += -DNO_GETTEXT >> >USE_GETTEXT_SCHEME ?= fallthrough >> > endif >> > +ifdef NO_POLL >> > + NO_SYS_POLL_H = YesPlease >> > + COMPAT_CFLAGS += -DNO_POLL -Icompat/poll >> > + COMPAT_OBJS += compat/po

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-17 Thread Ramkumar Ramachandra
Hi Junio, Junio C Hamano wrote: > Is this a sufficient replacement for what you removed from ? > Can the BUILD-OPTIONS file exist when your build of git failed? Oops, I didn't realize that BUILD-OPTIONS would be written when the build fails. How about something like this instead: diff --git

RE: [PATCH/RFC] Port to HP NonStop

2012-09-17 Thread Joachim Schmitz
Signed-off-by: Joachim Schmitz --- This needs the 4 compat-poll patches posted earlier. Needs a different link order in Makefile: libintl before libiconv. This may affect other platforms, so needs some checking. Also I'm not really sure how to best #ifdef the #include and the typedef (u)intptr_t

Re: [PATCH] t/perf: add "trash directory" to .gitignore

2012-09-17 Thread Ramkumar Ramachandra
Hi, Junio C Hamano wrote: > Thanks. I _think_ you still want to make sure these are > directories, so instead of losing the trailing slash, you would want > to keep it and add a leading slash to anchor them to the t/perf > directory, i.e. > > /build/ > /test-results/ > /tr

[RFC PATCH] add t3420-rebase-topology

2012-09-17 Thread Martin von Zweigbergk
Add more test cases to check that the topology after a rebase is as expected. Conflicts are not considered, but patch-equivalence is. --- Tests pass and fail as indicated by the suffix (_success/_failure). Your input especially appreciated on whether you agree with the intent of the test cases. Fo

RE: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-17 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Tuesday, September 18, 2012 12:42 AM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH v7 1/4] make poll available for other platforms lacking it > > "Joachim Schmitz" writes: > > > move poll.[ch] out of compat/win32/

RE: [PATCH v7 0/4] Support non-WIN32 systems lacking poll()

2012-09-17 Thread Joachim Schmitz
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Tuesday, September 18, 2012 12:39 AM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH v7 0/4] Support non-WIN32 systems lacking poll() > > "Joachim Schmitz" writes: > > > Posted but not properly chained... hope that d

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Ramkumar Ramachandra
Hi, Matthieu Moy wrote: > I can see two reasons for having the same UID for two login names: > > 1) the sysadmin really messed up, and as you say, a total stranger has > complete ownership of your files. Ramkumar, you should check that this > is not your case. Looks like my sysadmin really screwe

[PATCH] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-17 Thread Stefan Haller
Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep track of what you're looking at. This allows simplifying the prevfile and nextfile functions, because all they ha

Re: [PATCH 4/4] rebase -i: Add tests for "--edit-todo"

2012-09-17 Thread Martin von Zweigbergk
On Mon, Sep 17, 2012 at 10:23 PM, Andrew Wong wrote: > On 09/18/12 00:58, Martin von Zweigbergk wrote: >> On Mon, Sep 17, 2012 at 6:28 PM, Andrew Wong wrote: >>> + test M = $(git cat-file commit HEAD^ | sed -ne \$p) && >>> + test L = $(git cat-file commit HEAD | sed -ne \$p) >> I coul

Re: [PATCH 4/4] rebase -i: Add tests for "--edit-todo"

2012-09-17 Thread Andrew Wong
On 09/18/12 00:58, Martin von Zweigbergk wrote: > On Mon, Sep 17, 2012 at 6:28 PM, Andrew Wong wrote: >> + test M = $(git cat-file commit HEAD^ | sed -ne \$p) && >> + test L = $(git cat-file commit HEAD | sed -ne \$p) > I couldn't find "$" (match last line) in the POSIX man page for se

Re: [PATCH 4/4] rebase -i: Add tests for "--edit-todo"

2012-09-17 Thread Martin von Zweigbergk
On Mon, Sep 17, 2012 at 6:28 PM, Andrew Wong wrote: > + test M = $(git cat-file commit HEAD^ | sed -ne \$p) && > + test L = $(git cat-file commit HEAD | sed -ne \$p) I couldn't find "$" (match last line) in the POSIX man page for sed. Besides, I think $(git show -s --format=%s HEAD) r

Re: [PATCH] Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

2012-09-17 Thread Elia Pinto
Ok. Please use the patch that you have already queued in the ep integration branch. Thank you 2012/9/17, Junio C Hamano : > Elia Pinto writes: > >>> - That "165" thing I mentioned earlier. >> >> Thank you so much for the comments, that's fine. A single >> consideration for MALLOC_PERTURB. >>

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Junio C Hamano
Mischa POSLAWSKY writes: >> Perhaps you had configured your diff.noprefix in a wrong >> configuration file? This is primarily per-project choice, and your >> clone of git.git should not have diff.noprefix set, neither your >> $HOME/.gitconfig unless you always work on projects that want >> diff.

Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Tue, Sep 18, 2012 at 3:09 AM, Junio C Hamano wrote: >> Nguyen Thai Ngoc Duy writes: >> >>> On Mon, Sep 17, 2012 at 7:06 PM, Nguyen Thai Ngoc Duy >>> wrote: --mirror --single-branch combination does not look right. The "heads/" part is missing.. >>>

git diff across submodules

2012-09-17 Thread Kenny Simpson
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 ta

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Mischa POSLAWSKY
Junio C Hamano skribis 2012-9-16 22:22 (-0700): > Mischa POSLAWSKY writes: > > > Subject: [PATCH/RFC] format-patch: force default file prefixes in diff > > > > Override user configuration (eg. diff.noprefix) in patches intended for > > external consumption to match the default prefixes expected

[PATCH 3/4] rebase -i: Teach "--edit-todo" action

2012-09-17 Thread Andrew Wong
This allows users to edit the todo file while they're stopped in the middle of an interactive rebase. When this action is executed, all comments from the original todo file are stripped, and new help messages are appended to the end. Signed-off-by: Andrew Wong --- Documentation/git-rebase.txt |

[PATCH 4/4] rebase -i: Add tests for "--edit-todo"

2012-09-17 Thread Andrew Wong
Signed-off-by: Andrew Wong --- t/t3404-rebase-interactive.sh | 18 ++ 1 file changed, 18 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7304b66..6eafb63 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh

[PATCH 2/4] rebase -i: Refactor help messages for todo file

2012-09-17 Thread Andrew Wong
Signed-off-by: Andrew Wong --- 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 --- a/git-rebase--interactive.sh +++ b/git-rebase--

[PATCH 1/4] rebase usage: subcommands can not be combined with -i

2012-09-17 Thread Andrew Wong
From: Martin von Zweigbergk 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, 2011-02-28), the usage mess

[PATCH v3 0/4] rebase -i: Teach "--edit-todo" action

2012-09-17 Thread Andrew Wong
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

Gitk commit order leads to unnecessarily long lines

2012-09-17 Thread Sebastian Dörner
Hi, It seems like the order gitk uses for the commits sometimes leads to overly long lines. My use case is this repository (note that this svn-conversion is still WIP): http://www.sebastian-doerner.de/kompare.tgz Looking at this with "gitk --all" looks partly like this: http://i.imgur.com/oewTq.pn

Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Nguyen Thai Ngoc Duy
On Tue, Sep 18, 2012 at 3:09 AM, Junio C Hamano wrote: > Nguyen Thai Ngoc Duy writes: > >> On Mon, Sep 17, 2012 at 7:06 PM, Nguyen Thai Ngoc Duy >> wrote: >>> --mirror --single-branch combination does not look right. The "heads/" >>> part is missing.. >> >> It also does not look right for cloni

Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Nguyen Thai Ngoc Duy
On Tue, Sep 18, 2012 at 3:08 AM, Junio C Hamano wrote: > Nguyen Thai Ngoc Duy 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 everything without lea

Re: How to create the " [PATCH 0/5]" first email?

2012-09-17 Thread Junio C Hamano
Jeff King 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 '---'

Re: How to create the " [PATCH 0/5]" first email?

2012-09-17 Thread Jeff King
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 '---' > > separator. > > An uno

[PATCH/RFC] git-svn: use path accessor for Git::SVN objects

2012-09-17 Thread Eric Wong
The accessors should improve maintainability and enforce consistent access to Git::SVN objects. Signed-off-by: Eric Wong --- (RFC since I could've missed something) Eric Wong wrote: > I'll apply the following (on top of a patch which fixes some > {path} usages): git-svn.perl | 2

Re: [PATCH/RFC 5/5] Git::SVN: rename private path field

2012-09-17 Thread Eric Wong
Jonathan Nieder wrote: > All users of $gs->{path} should have been converted to use the > accessor by now. Check our work by renaming the underlying variable > to break callers that try to use it directly. > > Signed-off-by: Jonathan Nieder I think this is a good patch for master, too. Thanks

Re: [PATCH/RFC 5/5] Git::SVN: rename private path field

2012-09-17 Thread Junio C Hamano
Jonathan Nieder writes: > All users of $gs->{path} should have been converted to use the > accessor by now. Check our work by renaming the underlying variable > to break callers that try to use it directly. > > Signed-off-by: Jonathan Nieder > --- I like this ;-) If we know we have good cover

Re: How to create the " [PATCH 0/5]" first email?

2012-09-17 Thread Junio C Hamano
"Philip Oakley" 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 edit patches. Som

[PATCH] Allow fancy globs in git-svn init branches

2012-09-17 Thread Ammon Riley
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 --- git-svn.perl

Re: How to create the " [PATCH 0/5]" first email?

2012-09-17 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" 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 "arch/arm config files were…". O

Re: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-17 Thread Junio C Hamano
"Joachim Schmitz" 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 > --- > Makefile | 20

[PATCH] mailinfo: do not concatenate charset= attribute values from mime headers

2012-09-17 Thread Junio C Hamano
"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, forg

Re: [PATCH v7 0/4] Support non-WIN32 systems lacking poll()

2012-09-17 Thread Junio C Hamano
"Joachim Schmitz" writes: > Posted but not properly chained... hope that doesn't matter? Something small like this it doesn't. I am not into bureaucracy ;-) Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More major

Re: [PATCH 7/8] Doc clean: add See Also links

2012-09-17 Thread Philip Oakley
From: "Junio C Hamano" Matthieu Moy writes: Philip Oakley 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 everything from scratch, but keep manually created files. +SE

Re: [PATCH v3 05/14] Change fetch_pack() and friends to take string_list arguments

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 03:10:07PM -0700, Junio C Hamano wrote: > Michael Haggerty 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 wouldn't call

Re: [PATCH v3 05/14] Change fetch_pack() and friends to take string_list arguments

2012-09-17 Thread Junio C Hamano
Michael Haggerty 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 wouldn't call that a "policy". It's something we think about when adding a new "#include" to

Re: [PATCH 6/8] Doc add: link gitignore

2012-09-17 Thread Philip Oakley
From: "Junio C Hamano" Philip Oakley writes: Include the gitignore link with the paired gitrepository- layout link. Signed-off-by: Philip Oakley --- without the gitignore link users are unlikely to realise the significance of the repository layout link, nor what to look for within it diff

Re: [PATCH 3/8] Doc: Improve shallow depth wording

2012-09-17 Thread Philip Oakley
From: "Junio C Hamano" Philip Oakley 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 personally think it makes it a lot hard

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Junio C Hamano
Ralf Thielow 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 huge mist

Re: [PATCH v7 0/4] Support non-WIN32 systems lacking poll()

2012-09-17 Thread Joachim Schmitz
Joachim Schmitz wrote: 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

Re: [PATCH] t/perf: add "trash directory" to .gitignore

2012-09-17 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Signed-off-by: Ramkumar Ramachandra > --- > 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 > --- a/t/perf/.gitignore > +++ b/t/perf/.gitignor

[PATCH v7 4/4] make poll() work on platforms that can't recv() on a non-socket

2012-09-17 Thread Joachim Schmitz
This way it just got added to gnulib too the other day. Signed-off-by: Joachim Schmitz --- compat/poll/poll.c | 5 + 1 file changed, 5 insertions(+) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index e4b8319..10a204e 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -306,6

[PATCH v7 3/4] poll() exits too early with EFAULT if 1st arg is NULL

2012-09-17 Thread Joachim Schmitz
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 t

[PATCH v7 2/4] fix some win32 specific dependencies in poll.c

2012-09-17 Thread Joachim Schmitz
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 --- compat/poll/poll.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 9e7a25c..e4

Re: [PATCH] string_list API: document what "sorted" means.

2012-09-17 Thread Junio C Hamano
Michael Haggerty 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 print_string_list()), so it > sh

[PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-17 Thread Joachim Schmitz
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 --- Makefile | 20 +++- compat/{win32 => poll}/poll

Re: [PATCH v7 0/4] Support non-WIN32 systems lacking poll()

2012-09-17 Thread Joachim Schmitz
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 in

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Ralf Thielow
On Mon, Sep 17, 2012 at 10:18 PM, Junio C Hamano wrote: > Ralf Thielow 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 > combination of single and mirror, th

Re: [PATCH v6 0/4] Support non-WIN32 systems lacking poll()

2012-09-17 Thread Junio C Hamano
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

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-17 Thread Junio C Hamano
Ramkumar Ramachandra 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 have built g

Re: [PATCH] Make test output coloring more intuitive

2012-09-17 Thread Junio C Hamano
Adam Spiers 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 that something's no

Re: [PATCH] Add missing -z to git check-attr usage text for consistency with man page

2012-09-17 Thread Junio C Hamano
Adam Spiers writes: > Signed-off-by: Adam Spiers > --- > 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

Re: status of git interop with other VCS

2012-09-17 Thread Junio C Hamano
Ramkumar Ramachandra 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 fa/remote-h

Re: [PATCH v3 00/14] Clean up how fetch_pack() handles the heads list

2012-09-17 Thread Junio C Hamano
Michael Haggerty writes: > It is interesting that you consider the sort order of string_list to be > somewhat of an internal implementation detail. I had thought of its > current behavior as being the obvious thing and considered it part of > the API's contract. For example, the current sort or

Re: Unable to clone GIT project

2012-09-17 Thread Ben Walton
> 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

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano 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 log

Re: [PATCH] Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption

2012-09-17 Thread Junio C Hamano
Elia Pinto 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 freed buffers. >

Re: Using Format/export-subst Howto.

2012-09-17 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 15.09.2012 00:26: >> Junio C Hamano writes: >> >>> Michael J Gruber writes: >>> you need to "rm file && git checkout file"). If the user has to update $Id$ to match the current sha1 (by remembering to do a more force

Re: Unable to clone GIT project

2012-09-17 Thread Jeff King
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

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Junio C Hamano
Ralf Thielow 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 combination of single and mirror, the second best way would be to imply "mirror" and "single" combinatio

Re: [PATCH] Make test output coloring more intuitive

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 12:50:37PM +0100, Adam Spiers wrote: > The end result of these changes is that: > > - red is _only_ used for things which have gone unexpectedly wrong: > test failures, unexpected test passes, and failures with the > framework, > > - yellow is _only_ used for

Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Mon, Sep 17, 2012 at 7:06 PM, Nguyen Thai Ngoc Duy > wrote: >> --mirror --single-branch combination does not look right. The "heads/" >> part is missing.. > > It also does not look right for cloning a tag: > > $ LANG=C ./git clone --single-branch --branch=v1.7.

Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Junio C Hamano
Nguyen Thai Ngoc Duy 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 everything without leaving stuff out, and "single" is about grabbing only one thing with

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Junio C Hamano
Jeff King writes: > On Sun, Sep 16, 2012 at 10:24:04PM -0700, Junio C Hamano wrote: > >> Mischa POSLAWSKY writes: >> >> > Matching the default file prefix b/ does not yield any results if config >> > option diff.noprefix or diff.mnemonicprefix is enabled. >> > >> > Signed-off-by: Mischa POSLAWS

Re: Parallel make failed in perl/perl.mak

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 08:13:35PM +0200, Alex Riesen wrote: > mv: cannot stat `perl.mak': No such file or directory > mv: cannot move `perl.mak' to `perl.mak.old': No such file or directory > [...] > I wasn't able to reproduce it, so this message is the only thing I have. > It was the first compi

[PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-17 Thread Ralf Thielow
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

Re: How do I run tests under Valgrind?

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 11:19:35PM +0530, Ramkumar Ramachandra wrote: > +./test-lib.sh:477> file=/home/artagnon/src/git/t/../git-instaweb > +./test-lib.sh:479> make_valgrind_symlink > /home/artagnon/src/git/t/../git-instaweb > +make_valgrind_symlink:5> test -x /home/artagnon/src/git/t/../git-insta

Re: How do I run tests under Valgrind?

2012-09-17 Thread Ramkumar Ramachandra
Hi, Jeff King wrote: > Oh, bleh. Stupid automatic --tee for valgrind. Try this: > > SHELL="/usr/bin/zsh -x" ./t-basic.sh --valgrind I got tons of output, but found it unhelpful. Any other ideas? Ram -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message

Parallel make failed in perl/perl.mak

2012-09-17 Thread Alex Riesen
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]:

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Joachim Schmitz
Matthieu Moy wrote: Junio C Hamano 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 login names: 1)

Re: How do I run tests under Valgrind?

2012-09-17 Thread Jeff King
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

Re: How do I run tests under Valgrind?

2012-09-17 Thread Johannes Sixt
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 > your SHELL to /bin/sh to see if it makes a difference. Should

Re: How do I run tests under Valgrind?

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 11:09:27PM +0530, Ramkumar Ramachandra wrote: > Hi again, > > Jeff King wrote: > > That's certainly odd. It sounds like the valgrind setup is broken for > > you. Can you run: > > > > sh -x t-basic.sh --valgrind > > > > and see what's happening near those weird errors

Re: How do I run tests under Valgrind?

2012-09-17 Thread Ramkumar Ramachandra
Hi again, Jeff King wrote: > That's certainly odd. It sounds like the valgrind setup is broken for > you. Can you run: > > sh -x t-basic.sh --valgrind > > and see what's happening near those weird errors? Not helpful: + . ./test-lib.sh + mkdir -p test-results + basename t-basic.sh .sh

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Jeff King
On Sun, Sep 16, 2012 at 10:24:04PM -0700, Junio C Hamano wrote: > Mischa POSLAWSKY writes: > > > Matching the default file prefix b/ does not yield any results if config > > option diff.noprefix or diff.mnemonicprefix is enabled. > > > > Signed-off-by: Mischa POSLAWSKY > > --- > > Very useful s

Re: [PATCH/RFC] test-lib: add support for colors without tput

2012-09-17 Thread Johannes Sixt
Am 14.09.2012 19:28, schrieb Johannes Sixt: > Am 14.09.2012 18:58, schrieb Erik Faye-Lund: >> tput () { >> case "$1" in >> bold) >> -echo -ne "\033[1m" ;; >> +printf "\033[1m" ;; >> setaf) >> -ec

Re: How do I run tests under Valgrind?

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 10:53:18PM +0530, Ramkumar Ramachandra wrote: > Hi Peff, > > Jeff King wrote: > > No, that should work (and it does work here). I assume you can pass > > t without --valgrind? > > Yes. Here's the output from running it with --valgrind. I'm digging > deeper to see wh

Re: How do I run tests under Valgrind?

2012-09-17 Thread Ramkumar Ramachandra
Hi Peff, Jeff King wrote: > No, that should work (and it does work here). I assume you can pass > t without --valgrind? Yes. Here's the output from running it with --valgrind. I'm digging deeper to see what went wrong. make_valgrind_symlink:6: permission denied: /home/artagnon/src/git/t/..

Re: [PATCH] Documentation: indent-with-non-tab uses "equivalent tabs" not 8

2012-09-17 Thread Junio C Hamano
"Wesley J. Landaker" writes: > From: "Wesley J. Landaker" > > Update the documentation of the core.whitespace option > "indent-with-non-tab" to correctly reflect that it catches the use of > spaces instead of the equivalent tabs, rather than a fixed number. > > Signed-off-by: Wesley J. Landaker

Re: How do I run tests under Valgrind?

2012-09-17 Thread Jeff King
On Mon, Sep 17, 2012 at 10:31:07PM +0530, Ramkumar Ramachandra wrote: > I tried running `make valgind` inside t/ and got: > > bug in test framework: multiple prerequisite tags do not work reliably > > which means that even the basic tests don't pass. Am I doing something wrong? No, that sh

Re: [PATCH v2 4/5] Integrate wildmatch to git

2012-09-17 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > 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?

Re*: Content-Type handling

2012-09-17 Thread Junio C Hamano
Tomas Cohen Arazi writes: > Hi, I'm not sure it is a bug, but we used: > > git config --global format.headers "Content-Type: text/plain; > charset=\"utf-8\"" > > and recently (perhaps an Ubuntu default setup issue) the content-type > is being automatically set, the result is that patches contain

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Andreas Schwab
Ramkumar Ramachandra writes: > Hi Andreas, > > Andreas Schwab wrote: >> Ramkumar Ramachandra writes: >> >>> Hi Matthieu, >>> >>> Matthieu Moy wrote: Do you have any user with this login (finger kseygold)? I suspect you have two usernames with the same user ID. >>> >>> Login: kseygold

[PATCH] t/perf: add "trash directory" to .gitignore

2012-09-17 Thread Ramkumar Ramachandra
Signed-off-by: Ramkumar Ramachandra --- 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 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build

[PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-17 Thread Ramkumar Ramachandra
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 have built git yet. Signed-off-by: Ramkumar Ramachandra

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Matthieu Moy
Junio C Hamano 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 login names: 1) the sysadmin reall

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Junio C Hamano
Matthieu Moy writes: > Ramkumar Ramachandra 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 like this should do the trick:

Re: status of git interop with other VCS

2012-09-17 Thread Paul Wise
On Sun, 2012-09-16 at 19:45 +0800, Paul Wise wrote: > bzr: git-remote-bzr is part of bzr-git but it is quite buggy, > hopefully this will improve over time though. I've now learned that the main upstream for bzr-git is slowly stepping down from his involvement in Bazaar and Bazaar packaging, so i

RE: Using Format/export-subst Howto.

2012-09-17 Thread Mestnik, Michael J - Eagan, MN - Contractor
> -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. > > Mestn

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Matthieu Moy
Ramkumar Ramachandra 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 like this should do the trick: --- a/t/t1304-default-acl.sh +++ b

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Ramkumar Ramachandra
Hi Andreas, Andreas Schwab wrote: > Ramkumar Ramachandra writes: > >> Hi Matthieu, >> >> Matthieu Moy wrote: >>> Do you have any user with this login (finger kseygold)? I suspect you >>> have two usernames with the same user ID. >> >> Login: kseygold Name: Seybold > > What

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Andreas Schwab
Ramkumar Ramachandra writes: > Hi Matthieu, > > Matthieu Moy wrote: >> Do you have any user with this login (finger kseygold)? I suspect you >> have two usernames with the same user ID. > > Login: kseygold Name: Seybold What about "id kseygold; id ramkum"? Andreas. --

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Matthieu Moy
Ramkumar Ramachandra writes: > Hi Matthieu, > > Matthieu Moy wrote: >> Do you have any user with this login (finger kseygold)? I suspect you >> have two usernames with the same user ID. > > Login: kseygold Name: Seybold > Directory: /home/likewise-open/ANT/kseygold She

[PATCH] string_list API: document what "sorted" means.

2012-09-17 Thread Michael Haggerty
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 print_string_list()), so it shouldn't be changed willy-nilly. Ther

[PATCH] fetch-pack.h: remove unnecessary #include

2012-09-17 Thread Michael Haggerty
Given the git project policy that *.c files that include header files are responsible for including everything the headers they include need, there is no need for fetch-pack.h to include string-list.h itself. As for the files that include fetch-pack.h: * builtin/clone.c and builtin/fetch-pack.c

Re: Test failure: Test #3 in t1304-default-acl

2012-09-17 Thread Ramkumar Ramachandra
Hi Matthieu, Matthieu Moy wrote: > Do you have any user with this login (finger kseygold)? I suspect you > have two usernames with the same user ID. Login: kseygold Name: Seybold Directory: /home/likewise-open/ANT/kseygold Shell: /bin/zsh Office: Kelly Last login Tue

  1   2   >