[ANNOUNCE] Sharness - Test library derived from Git

2012-07-17 Thread Mathias Lafeldt
Hi, I've been wanting to announce Sharness [1] on this list for quite some time now, but never managed to do so. With the release of version 0.2.4, I think it's about time to change that. Sharness is a shell-based test harness library. It was derived from the Git project and is basically a

Re: [GSoC] Designing a faster index format - Progress report week 13

2012-07-17 Thread Thomas Gummerer
On 07/16, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: == Work done in the previous 12 weeks == - Definition of a tentative index file v5 format [1]. This differs from the proposal in making it possible to bisect the directory entries and file entries, to

Re: [GSoC] Designing a faster index format - Progress report week 13

2012-07-17 Thread Thomas Gummerer
Thanks Junio for reading the progress report, this is just corrected version without the errors that he pointed out. == Work done in the previous 12 weeks == - Definition of a tentative index file v5 format [1]. This differs from the proposal in making it possible to bisect the directory

Re: Don't share anything but those files

2012-07-17 Thread Nick Douma
Hoi, On 13-07-12 16:40, Yves Perron wrote: I'm wondering how to commit only selected files/folders on GIT, if even possible. Note, the ignore list is not a good option for me as I'd like to add a few files in a folder that contains many hundreds for instance. Basically, I'm looking for a

Re: git-p4: Jobs and skipSubmitEdit

2012-07-17 Thread Michael Horowitz
Pete, I gave the patch a try, and it seems to work great. Only problem I realized is that it means that the git commit message and the p4 log message end up different, because to p4 the jobs lines are special and get stripped out, but in git it just stays part of the commit message. So, when

possible bug in autocompletion

2012-07-17 Thread Jeroen Meijer
We have a tag name with some special characters. The tag name is 'Build%20V%20${bamboo.custom.jiraversion.name}%20Build%20721'. In somecases where autocompletion is used an error is given, such as 'bash: Build%20V%20${bamboo.custom.jiraversion.name}%20Build%20721: bad substitution'. This can

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Florian Achleitner
On Monday 16 July 2012 22:27:25 Jonathan Nieder wrote: Florian Achleitner wrote: When it does advertise refspec like: Debug: Remote helper: - refspec refs/heads/master:refs/remotes/svnfile/master it all works. Unfortunatly I didn't understand that a day ago. Hm, that still doesn't look

[PATCH] Add explanatory comment for transport-helpers refs mapping.

2012-07-17 Thread Florian Achleitner
transport-helpers can advertise the 'refspec' capability, if not a default refspec *:* is assumed. This could be helpful information for the reader. Signed-off-by: Florian Achleitner florian.achleitner.2.6...@gmail.com --- transport-helper.c | 10 ++ 1 file changed, 10 insertions(+)

git rebase -i does not rebase if all lines are removed

2012-07-17 Thread Orgad and Raizel Shaneh
Make a commit on top of master. git rebase -i origin/master Remove the commit. Git prints Nothing to do and does not rebase. Running 'git rebase -i' when there are no local commits has 'noop' in the first line, and with it the rebase is successful. Why is this 'noop' mandatory? - Orgad -- To

Re: git rebase -i does not rebase if all lines are removed

2012-07-17 Thread Carlos Martín Nieto
On Tue, 2012-07-17 at 13:46 +0300, Orgad and Raizel Shaneh wrote: Make a commit on top of master. git rebase -i origin/master Remove the commit. Git prints Nothing to do and does not rebase. Running 'git rebase -i' when there are no local commits has 'noop' in the first line, and

Re: possible bug in autocompletion

2012-07-17 Thread Jeff King
On Tue, Jul 17, 2012 at 11:10:39AM +0200, Jeroen Meijer wrote: We have a tag name with some special characters. The tag name is 'Build%20V%20${bamboo.custom.jiraversion.name}%20Build%20721'. In somecases where autocompletion is used an error is given, such as 'bash:

Re: git rebase -i does not rebase if all lines are removed

2012-07-17 Thread Johannes Sixt
Am 7/17/2012 12:55, schrieb Carlos Martín Nieto: But more important would be /why/ you feel that rebase -i is the tool you should be using. If you'd like to move the branch pointer back, that's what the reset command is for. Perhaps because that's not what the OP wanted to do? Sometimes it

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Jonathan Nieder
Florian Achleitner wrote: On Monday 16 July 2012 22:27:25 Jonathan Nieder wrote: Hm, that still doesn't look right. The RHS of the refspec is supposed to be a _private_ namespace for the remote helper, and refs/remotes/ is not private. [...] remote-svn now uses get_fetch_map to retrieve the

[PATCH 0/2] git-remote-mediawiki: two more fixes

2012-07-17 Thread Matthieu Moy
These patches can be added to branch mm/mediawiki-usability in pu. For the curious: I originally had patch 2/2 in my serie, but mistakenly discarded it during a rebase. While recovering it and testing it, I found a typo fixed by patch 1/2. Matthieu Moy (2): git-remote-mediawiki: fix incorrect

[PATCH 2/2] git-remote-mediawiki: allow page names with a ':'

2012-07-17 Thread Matthieu Moy
Traditionnally, pages named Foo:Bar are page 'Bar' in namespace 'Foo'. However, it is also possible to call a page Foo:Bar if 'Foo' is not a namespace. In this case, the actual name of the page is 'Foo:Bar', in the main namespace. Since we can't tell with only the filename, query the wiki for a

[PATCH 1/2] git-remote-mediawiki: fix incorrect test usage in test

2012-07-17 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- contrib/mw-to-git/t/push-pull-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/t/push-pull-tests.sh b/contrib/mw-to-git/t/push-pull-tests.sh index 6692a0f..9da2dc5 100644 ---

Re: [PATCH] Add explanatory comment for transport-helpers refs mapping.

2012-07-17 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: --- a/transport-helper.c +++ b/transport-helper.c @@ -484,8 +484,18 @@ static int fetch_with_import(struct transport *transport, if (posn-status REF_STATUS_UPTODATE) continue; if (data-refspecs) +

[PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable

2012-07-17 Thread Michael Witten
The tests in: t/t1306-xdg-files.sh were failing because the git commands were using the environment variable `XDG_CONFIG_HOME' as it was set for the user's usual environment, rather than as set for the testing environment. This commit provides the quickest, simplest hack to make things work;

Re: Fix git-svn tests for SVN 1.7.5.

2012-07-17 Thread Jonathan Nieder
Hi! Michael G Schwern wrote: I've fixed the git-svn tests for SVN 1.7 and tested with SVN 1.7.5. Thanks. git-svn is not maintained by Junio but by Eric and others on the list. I'm cc-ing Eric and Ben Walton so they can benefit from your work.

[PATCH 2/3] Testing: XDG config files: Use $HOME and $XDG_CONFIG_HOME explicitly

2012-07-17 Thread Michael Witten
The tests in: t/t1306-xdg-files.sh relied on brittle conventions: * $HOME and $XDG_CONFIG_HOME having certain values. * The testing commands having a certain current working directory; at least one test failed as a result. This commit mitigates the problem by using the variables

[PATCH 3/3] Testing: XDG config files: Trivial: `xdg' - `XDG'

2012-07-17 Thread Michael Witten
For the sake of consistency and correctness, the acronymn `xdg' has been capitalized (`XDG'). Signed-off-by: Michael Witten mfwit...@gmail.com --- t/t1306-xdg-files.sh | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh

Re: [PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable

2012-07-17 Thread Jonathan Nieder
Hi, Michael Witten wrote: --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -544,6 +544,9 @@ rm -fr $test || { HOME=$TRASH_DIRECTORY export HOME +XDG_CONFIG_HOME=$HOME/.config +export XDG_CONFIG_HOME + I think this is a bad idea. The typical case is for XDG_CONFIG_HOME not to be set, and

Re: [PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable

2012-07-17 Thread Matthieu Moy
Michael Witten mfwit...@gmail.com writes: --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -544,6 +544,9 @@ rm -fr $test || { HOME=$TRASH_DIRECTORY export HOME +XDG_CONFIG_HOME=$HOME/.config +export XDG_CONFIG_HOME + Why not just unset XDG_CONFIG_HOME? Your match makes it look like

Re: [PATCH 2/3] Testing: XDG config files: Use $HOME and $XDG_CONFIG_HOME explicitly

2012-07-17 Thread Matthieu Moy
Michael Witten mfwit...@gmail.com writes: The tests in: t/t1306-xdg-files.sh relied on brittle conventions: * $HOME and $XDG_CONFIG_HOME having certain values. * The testing commands having a certain current working directory; Other tests (t1305-config-include.sh at least)

Re: [PATCH 1/3] Testing: XDG config files: Export a suitable `XDG_CONFIG_HOME' environment variable

2012-07-17 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Before your patches, the correct management of $XDG_CONFIG_HOME to override $HOME/.config/git/ was untested (which is unfortunate, indeed), but after your patch serie, the fact that the default is $HOME/.config/git/ is untested, which IMHO is

Re: [ANNOUNCE] Sharness - Test library derived from Git

2012-07-17 Thread Ævar Arnfjörð Bjarmason
On Tue, Jul 17, 2012 at 10:06 AM, Mathias Lafeldt mathias.lafe...@gmail.com wrote: I've been wanting to announce Sharness [1] on this list for quite some time now, but never managed to do so. With the release of version 0.2.4, I think it's about time to change that. Sharness is a shell-based

Re: Fix git-svn tests for SVN 1.7.5.

2012-07-17 Thread Michael G Schwern
On 2012.7.17 10:44 AM, Jonathan Nieder wrote: Michael G Schwern wrote: I've fixed the git-svn tests for SVN 1.7 and tested with SVN 1.7.5. Thanks. git-svn is not maintained by Junio but by Eric and others on the list. I'm cc-ing Eric and Ben Walton so they can benefit from your work.

[PATCH] commit-tree: resurrect command line parsing updates

2012-07-17 Thread Junio C Hamano
79a9312 (commit-tree: update the command line parsing, 2011-11-09) updated the command line parser to understand the usual flags first and then non-flag arguments order, in addition to the original and a bit unusual tree comes first and then zero or more -p parent. Unfortunately, ba3c69a (commit:

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Florian Achleitner
On Tuesday 17 July 2012 08:48:20 Jonathan Nieder wrote: Florian Achleitner wrote: On Monday 16 July 2012 22:27:25 Jonathan Nieder wrote: Hm, that still doesn't look right. The RHS of the refspec is supposed to be a _private_ namespace for the remote helper, and refs/remotes/ is not

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: So we want the transport-helper to touch only private refs, i.e. some subdir of refs/, ok. On the other hand I thought we expect git-fetch to update the RHS of the passed refspec (or the default one ). How? Now I am getting confused by terminology. By the

Re: [PATCH v2] Fix notes handling in rev-list

2012-07-17 Thread Jukka Lehtniemi
First of all, thanks for you feedback, both of you. And sorry for wasting your time . I thought that the In-Reply-To-header would serve as a reference to the original patch but obviously it wasn't enough. On Tue, Jul 17, 2012 at 8:42 AM, Junio C Hamano gits...@pobox.com wrote: I wonder if we

Re: [PATCH] Fix overwritten remote ref on with fast-import.

2012-07-17 Thread Florian Achleitner
On Tuesday 17 July 2012 16:02:12 Jonathan Nieder wrote: Hi, Florian Achleitner wrote: So we want the transport-helper to touch only private refs, i.e. some subdir of refs/, ok. On the other hand I thought we expect git-fetch to update the RHS of the passed refspec (or the default one

Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
On 2012.7.17 10:44 AM, Jonathan Nieder wrote: My advice would be to send five or so of the patches that you would like to be reviewed first, inline, one per message, in reply to this message so we can start to work on that. Presumably the patches do not regress git-svn's behavior but only

Extract Git classes from git-svn (2/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 683a230e439f1d5ac2727ce4c2a74e93804fc72b Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Wed, 11 Jul 2012 22:16:01 -0700 Subject: [PATCH 03/11] Fix Git::SVN so it can at least compile alone. It's still very intertwined with git-svn, but that's a lot of work. This

Extract Git classes from git-svn (3/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 5f0b609e9b0a70c86c46b48f0b180c96c3355a14 Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Tue, 17 Jul 2012 15:40:03 -0700 Subject: [PATCH 04/11] Extract Git::SVN::Log from git-svn. This is a straight cut paste. Next commit will make it work. This will make it

Extract Git classes from git-svn (4/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 8f70be0424a770c299b6a0c5bf99e4030e5e4d92 Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Thu, 12 Jul 2012 16:58:53 -0700 Subject: [PATCH 05/11] Make Git::SVN::Log work. Changes to Git::SVN::Log to make it compile * Change the $_git_format lexical only used by

Extract Git classes from git-svn (5/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From ab67ab421dbfd248b9a198b8cc1cd9944ba6178d Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Tue, 17 Jul 2012 15:46:44 -0700 Subject: [PATCH 06/11] Move Git::SVN::Migration into its own file. Just a straight cut paste, the fixes come next commit. --- git-svn.perl

Extract Git classes from git-svn (6/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From cb1a73929da15e87fa3dcc41c4cfa9ca592081fa Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Thu, 12 Jul 2012 17:14:24 -0700 Subject: [PATCH 07/11] Fix Git::SVN::Migration after its move. Also... * eliminate the big import all the Git command functions loop, nothing

Extract Git classes from git-svn (7/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 9ff49d9e91c9741d501620ac47f78d8ff8ef9983 Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Tue, 17 Jul 2012 15:51:53 -0700 Subject: [PATCH 08/11] Cut paste Git::IndexInfo into its own file. No other changes, those are next commit so they can be seen in the diff. ---

Extract Git classes from git-svn (8/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 4fd7b8574b32753dcf22ec0a592f13586b938689 Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Thu, 12 Jul 2012 17:20:02 -0700 Subject: [PATCH 09/11] Fix Git::IndexInfo so it compiles. Only used by Git::SVN::Fetcher. --- perl/Git/IndexInfo.pm | 2 ++

Extract Git classes from git-svn (9/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 368d6c7883080d85f82b1eae1815834e3d59ef5e Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Tue, 17 Jul 2012 15:54:33 -0700 Subject: [PATCH 10/11] Cut paste Git::SVN::GlobSpec into its own file. Fixes to make it work come next commit. --- git-svn.perl |

Extract Git classes from git-svn (10/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
From 5152b76800f076ba0bd528664f62d3c67966fa4e Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Thu, 12 Jul 2012 17:25:25 -0700 Subject: [PATCH 11/11] Fix Git::SVN::GlobSpec so it works. Only used in one place in Git::SVN, load it on demand. That should be all the Git

Re: Extract Git classes from git-svn (1/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: There's five classes, so this is ten patches. Let me go on record again to state that this one-inline-patch-per-email is a lot of busy work for me. Well, there's no need to protest and go along with it if it's a bad idea. It's just what we've found to be the

Re: Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: Ok, here goes. First patch overhauls perl/Makefile.PL to make it easier to add .pm files, which I'm going to be doing a lot of. Instead of having to manually add to the %pm hash, it scans for .pm files. An excellent goal. It also moves Error.pm into a bundle

Re: Extract Git classes from git-svn (2/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: From 683a230e439f1d5ac2727ce4c2a74e93804fc72b Mon Sep 17 00:00:00 2001 From: Michael G. Schwern schw...@pobox.com Date: Wed, 11 Jul 2012 22:16:01 -0700 Just like with patch 1, the mail body should lose the above. Subject: [PATCH 03/11] Fix Git::SVN so it can at

Re: Extract Git classes from git-svn (3/10) (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Michael G Schwern wrote: This is a straight cut paste. Next commit will make it work. As mentioned in reply to patch 3, we can't take this, but by swapping the order of the two patches it should be possible to make it work. Jonathan -- To unsubscribe from this list: send the line unsubscribe

Re: git-p4: Jobs and skipSubmitEdit

2012-07-17 Thread Pete Wyckoff
m...@horowitz.name wrote on Tue, 17 Jul 2012 04:49 -0400: I gave the patch a try, and it seems to work great. Only problem I realized is that it means that the git commit message and the p4 log message end up different, because to p4 the jobs lines are special and get stripped out, but in

RE: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-17 Thread Jakub Vrana
Yes, I was fixing the invalid (!pgm) condition, sorry for a non-precise description. Does it mean that my patch is accepted or is there something else I need to do? -- Jakub Vrana -Original Message- From: Jeff King [mailto:p...@peff.net] Sent: Monday, July 16, 2012 9:16 PM To: Jakub

Re: Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Michael G Schwern
On 2012.7.17 5:01 PM, Jonathan Nieder wrote: It also moves Error.pm into a bundle directory. This both makes it just another directory to scan (or not scan), but it also makes it possible to bundle additional modules in the future. ExtUtils::MakeMaker uses this technique itself. This is

Re: Find .pm files automatically (was Re: Fix git-svn tests for SVN 1.7.5.)

2012-07-17 Thread Jonathan Nieder
Thanks for the reply. Quick clarifications: Michael G Schwern wrote: The man page is now man3/bundles::Error::Error.3 which is equally as incorrect as man3/private-Error.3. It is possible to correct that so it's man3/Error.3, but that's going to require some effort. Basically its in the

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-17 Thread Junio C Hamano
Jakub Vrana ja...@vrana.cz writes: Yes, I was fixing the invalid (!pgm) condition, sorry for a non-precise description. Does it mean that my patch is accepted or is there something else I need to do? The impression I got from Peff's review was that the problem description in the proposed

Re: [PATCH] Fix Q-encoded multi-octet-char split in email.

2012-07-17 Thread Junio C Hamano
Ping on a seemingly stalled thread. -- 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

Re: Extract Git classes from git-svn (1/10)

2012-07-17 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: The mailing list archive at http://news.gmane.org/gmane.comp.version-control.git might be useful for seeing some examples of how it plays out in practice. By allowing people to easily publish a completed work, and making it easier for them to let

Re: git_getpass regression?

2012-07-17 Thread Junio C Hamano
Ping on seemingly stalled discussion. -- 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

Re: [PATCH] branch: make --set-upstream saner without an explicit starting point

2012-07-17 Thread Junio C Hamano
Ping on a seemingly stalled discussion (no need to rush but just checking). -- 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