Re: t1450-fsck (sometimes/often) failes on Mac OS X

2012-07-16 Thread Thomas Rast
Torsten Bögershausen writes: > Now it appeared on next as well, so it's time to look a little bit deeper. > > This test case of t1450 fails: > test_expect_success 'tag pointing to something else than its type' ' > > To debug more, I added an exit 0 here to inspect the file named out: > diff --git

Re: How can I append authentication with "git push" ?

2012-07-16 Thread J. Bakshi
Any idea please ? On Thu, 12 Jul 2012 13:48:44 +0530 "J. Bakshi" wrote: > > Dear list, > > Is there any option to add user-name and password with git push ? > Or any repo wise configuration file where I can save the info, so that > it doesn't ask the credential before every push ? > > Thanks

Re: [PATCH] config: fix several access(NULL) calls

2012-07-16 Thread Matthieu Moy
Junio C Hamano writes: > if (use_global_config) { > if (is $HOME/.gitconfig usable?) { > use it; Yes, but when $HOME is unset, the question doesn't really make sense. Maybe the file exists, but we can't know since the user broke his configuration by un

Re: [PATCH maint-1.6.5 v2] block-sha1: avoid pointer conversion that violates alignment constraints

2012-07-16 Thread Michael Cree
On 16/07/12 09:27, Jonathan Nieder wrote: > Michael Cree wrote: > >> On 15/07/2012, at 8:50 AM, Jonathan Nieder wrote: > >>> gcc takes full advantage by converting the get_be32 >>> calls back to a load and bswap and producing a whole bunch of >>> unaligned access traps. >> >> Al

Re: [PATCH] status: default in-progress color to header color

2012-07-16 Thread Matthieu Moy
Jeff King writes: > Subject: [PATCH] status: color in-progress message like other header messages My feeling is that these "in progress" messages would deserve to be more visible than the usual headers (like "Not currently on any branch.", which is both legit and likely to be a user-error). For

Re: How can I append authentication with "git push" ?

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 01:55:12PM +0530, J. Bakshi wrote: > Any idea please ? Did you miss the four responses here: http://thread.gmane.org/gmane.comp.version-control.git/201351 ? -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@v

Re: [PATCH] status: default in-progress color to header color

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 11:59:45AM +0200, Matthieu Moy wrote: > Jeff King writes: > > > Subject: [PATCH] status: color in-progress message like other header > > messages > > My feeling is that these "in progress" messages would deserve to be more > visible than the usual headers (like "Not cur

Re: [PATCH] doc: A few minor copy edits.

2012-07-16 Thread Zbigniew Jędrzejewski-Szmek
On 07/15/2012 11:43 AM, Štěpán Němec wrote: > On Sat, 14 Jul 2012 22:32:05 -0700 > Junio C. Hamano wrote: > >> Thanks. All looked reasonable, except that I've heard nobody says >> "ent" for the past couple of years, and it might be better to drop >> the entry altogether. Please keep it, it's funn

[PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index a6ad8cf..a2da52f 100755 --- a/contrib/mw-to-git/git-remote-med

[PATCH 5/8] git-remote-mediawiki: use --force when adding notes

2012-07-16 Thread Matthieu Moy
When notes are created to record a push, it normally doesn't exist yet. However, when a push is interrupted and then restarted, it may happen that a commit already has notes attached, and we want to reflect the newly created remote revision, hence use 'git notes add -f' to override the existing one

[PATCH 3/8] git-remote-mediawiki: make mediafiles export optional

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 24 ++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index a2da52f..8e46e4e 100755 --- a/contrib/mw-to-

[PATCH 6/8] git-remote-mediawiki: show progress information when listing pages

2012-07-16 Thread Matthieu Moy
Initial phases of push and pull with git-remote-mediawiki can be long on a large wiki. Let the user know what's going on. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contri

[PATCH 4/8] git-remote-mediawiki: get rid of O(N^2) loop

2012-07-16 Thread Matthieu Moy
The algorithm to find a path from the local revision to the remote one was calling "git rev-list" and parsing its output N times. Run rev-list only once, and fill a hashtable with the result to optimize the body of the loop. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki

[PATCH 1/8] git-remote-mediawiki: don't split namespaces with spaces

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index accd70a..a6ad8cf 100755 --- a/contrib/mw-to-git/git-remote-mediawiki +

[PATCH 8/8] git-remote-mediawiki: properly deal with invalid remote revisions

2012-07-16 Thread Matthieu Moy
Some wiki, including https://git.wiki.kernel.org/ have invalid revision numbers (i.e. the actual revision numbers are non-contiguous). Don't die when encountering one. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 13 + 1 file changed, 9 insertions(+), 4 de

[PATCH 0/8] git-remote-mediawiki: fixes, optimizations, and progress report

2012-07-16 Thread Matthieu Moy
After the recent improvements to git-remote-mediawiki, I did a bit of real-life testing, by importing https://ensiwiki.ensimag.fr/ and https://git.wiki.kernel.org/. It turned out we had a few blocking bugs and a grossly unoptimized algorithm on push. This patch serie makes git-remote-mediawiki usab

[PATCH 7/8] git-remote-mediawiki: show progress information when getting last remote revision

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index 755c9d0..cf467ac 100755 --- a/contrib/mw-to-git/git-remote-mediawiki +++ b/contrib/m

[PATCH] Documentation/git-daemon: add missing word

2012-07-16 Thread Michael Schubert
Signed-off-by: Michael Schubert --- Documentation/git-daemon.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 31b28fc..e8f7577 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -

[PATCH] refname format cleanup

2012-07-16 Thread Michael Schubert
Previous discussion: http://thread.gmane.org/gmane.comp.version-control.git/200129/focus=200146 I'm not sure if I've drawn the right conclusions from the previous thread, so please let me know in case that's the wrong way to go.. * refs: disallow ref components starting with hyphen * symbolic

[PATCH 1/2] refs: disallow ref components starting with hyphen

2012-07-16 Thread Michael Schubert
Currently, we allow refname components to start with a hyphen. There's no good reason to do so and it troubles the parseopt infrastructure. Explicitly refuse refname components starting with a hyphen inside check_refname_component(). Revert 63486240, which is obsolete now. Signed-off-by: Michael

[PATCH 2/2] symbolic-ref: check format of given refname

2012-07-16 Thread Michael Schubert
Currently, it's possible to update HEAD with a nonsense reference since no strict validation ist performed. Example: $ git symbolic-ref HEAD 'refs/heads/master > > > ' Fix this by checking the given reference with check_refname_format(). Signed-off-by: Michael Schubert ---

Re: merge recursive and code movement

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 12:17:26AM +, Techlive Zheng wrote: > So, Is there any progress on these patches, I am currently need this > functionality very much, will these be merged into master? No. Turning on break detection in merge-recursive triggered bugs elsewhere in merge-recursive. See th

Re: [PATCH 1/2] refs: disallow ref components starting with hyphen

2012-07-16 Thread Michael Haggerty
On 07/16/2012 02:13 PM, Michael Schubert wrote: Currently, we allow refname components to start with a hyphen. There's no good reason to do so and it troubles the parseopt infrastructure. Explicitly refuse refname components starting with a hyphen inside check_refname_component(). Your change t

Re: [PATCH 2/2] symbolic-ref: check format of given refname

2012-07-16 Thread Michael Haggerty
On 07/16/2012 02:13 PM, Michael Schubert wrote: Currently, it's possible to update HEAD with a nonsense reference since no strict validation ist performed. Example: $ git symbolic-ref HEAD 'refs/heads/master > > > ' Fix this by checking the given reference with check_refn

Bug: fatal: patch fragment without header at line

2012-07-16 Thread tuxdna
Git version: git-1.7.7.6-1.fc16.x86_64 I am getting an error with a patch that I am applying to a git repository. I have created a test case for this issue that I am facing. $ git apply --check 0001-modified-README.patch fatal: patch fragment without header at line 7: @@ -635,9 +635,7 @@ some_fun

Re: Don't share anything but those files

2012-07-16 Thread Yves Perron
Greetings everyone, After investigation, the solution turns out to solve the problem partially. What is does is it update any existing files/folders already present but does not actually add new ones. So my question is, could the content of "what to add" be edited directly? Where is the actual re

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Marc Branchaud
On 12-07-14 02:59 AM, mhag...@alum.mit.edu wrote: > From: Michael Haggerty > > Add a new Python script, contrib/hooks/post-receive-multimail.py, that > can be used to send notification emails describing pushes into a git > repository. This script is derived from > contrib/hooks/post-receive-mail

Re: t1450-fsck (sometimes/often) failes on Mac OS X

2012-07-16 Thread Torsten Bögershausen
Am 16.07.2012 um 09:57 schrieb Thomas Rast: > Torsten Bögershausen writes: > >> Now it appeared on next as well, so it's time to look a little bit deeper. >> >> This test case of t1450 fails: >> test_expect_success 'tag pointing to something else than its type' ' >> >> To debug more, I added

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Matthieu Moy
mhag...@alum.mit.edu writes: > From: Michael Haggerty > > Add a new Python script, contrib/hooks/post-receive-multimail.py, that > can be used to send notification emails describing pushes into a git > repository. This script is derived from > contrib/hooks/post-receive-mail, but has many differ

Re: [PATCH] config: fix several access(NULL) calls

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> if (use_global_config) { >> if (is $HOME/.gitconfig usable?) { >> use it; > > Yes, but when $HOME is unset, the question doesn't really make sense. > Maybe the file exists, but we can't know since the us

Re: [PATCH] config: fix several access(NULL) calls

2012-07-16 Thread Matthieu Moy
Junio C Hamano writes: > I would think that it is plausible that the user wanted to write > into XDG one and used "unset HOME" as a way to signal that wish. I didn't think of this case, but it makes sense. Anyway, I don't really care either way, so I leave it up to you (either your patch below

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Michael Haggerty
On 07/16/2012 05:57 PM, Marc Branchaud wrote: On 12-07-14 02:59 AM, mhag...@alum.mit.edu wrote: * Various changes to the format of the notification emails: * List commits in chronological (rather than topological) order. I'm not sure this is a good idea. Topological order ensures that the

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Michael Haggerty
On 07/16/2012 06:16 PM, Matthieu Moy wrote: mhag...@alum.mit.edu writes: From: Michael Haggerty Add a new Python script, contrib/hooks/post-receive-multimail.py, that can be used to send notification emails describing pushes into a git repository. This script is derived from contrib/hooks/po

Re: [PATCH] config: fix several access(NULL) calls

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> I would think that it is plausible that the user wanted to write >> into XDG one and used "unset HOME" as a way to signal that wish. > > I didn't think of this case, but it makes sense. > > Anyway, I don't really care either way, so I leave it

Re: [PATCH 1/2] refs: disallow ref components starting with hyphen

2012-07-16 Thread Junio C Hamano
Michael Schubert writes: > Currently, we allow refname components to start with a hyphen. There's > no good reason to do so... That is way too weak as a justification to potentially break existing repositories. Refusal upon attempted creation is probably OK, which is why the two checks you remo

Re: [PATCH 2/2] symbolic-ref: check format of given refname

2012-07-16 Thread Junio C Hamano
Michael Schubert writes: > Currently, it's possible to update HEAD with a nonsense reference since > no strict validation ist performed. Example: > > $ git symbolic-ref HEAD 'refs/heads/master > > > > > > ' > > Fix this by checking the given reference with check_refname_format()

Re: Bug: fatal: patch fragment without header at line

2012-07-16 Thread Junio C Hamano
tuxdna writes: > Git version: git-1.7.7.6-1.fc16.x86_64 > > I am getting an error with a patch that I am applying to a git repository. > I have created a test case for this issue that I am facing. > > $ git apply --check 0001-modified-README.patch > fatal: patch fragment without header at line 7:

Re: Implementing authenticated Smart HTTP - which URLs to secure

2012-07-16 Thread Jonas H.
On 07/15/2012 10:49 PM, Shawn Pearce wrote: On Sun, Jul 15, 2012 at 6:43 AM, Jonas H. wrote: I'd like to implement HTTP authentication for Git Smart HTTP using Dulwich (a Python binding): 1) read-only if unauthenticated and write only if authenticated 2) read/write only if authenticated I cou

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Junio C Hamano
Michael Haggerty writes: > It's already supported: > > git config hooks.announcelist \ > "n...@example.com, overwhel...@example.com, p...@example.com" > git config hooks.refchangelist \ > "n...@example.com, overwhel...@example.com" > git config hooks.commitlist "n...@e

Re: [PATCH 1/2] refs: disallow ref components starting with hyphen

2012-07-16 Thread Junio C Hamano
Junio C Hamano writes: > Michael Schubert writes: > >> Currently, we allow refname components to start with a hyphen. There's >> no good reason to do so... > > That is way too weak as a justification to potentially break > existing repositories. > > Refusal upon attempted creation is probably OK

[ANN] SubGit 1.0.0 RC1

2012-07-16 Thread Semen Vadishev
Hello All, I'm glad to report that SubGit 1.0 RC1 is available for download at http://subgit.com/ SubGit is a server side tool that enables transparent two-way synchronization between Subversion and Git. Being installed into Subversion repository, SubGit provides safe and smooth Svn to Git migra

Re: [PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > Signed-off-by: Matthieu Moy > --- > contrib/mw-to-git/git-remote-mediawiki | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/contrib/mw-to-git/git-remote-mediawiki > b/contrib/mw-to-git/git-remote-mediawiki > index a6ad8cf..a2da52f 100755 >

Re: [PATCH 3/8] git-remote-mediawiki: make mediafiles export optional

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > Signed-off-by: Matthieu Moy It would have been nicer to hint why people may want to omit mediafiles from their export under what condition somewhere in the documentation or at least in the proposed commit log message. -- To unsubscribe from this list: send the line "unsub

Re: [PATCH 4/8] git-remote-mediawiki: get rid of O(N^2) loop

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > The algorithm to find a path from the local revision to the remote one > was calling "git rev-list" and parsing its output N times. Run rev-list > only once, and fill a hashtable with the result to optimize the body of > the loop. Good thinking. I wonder if it would furth

Re: [PATCH 1/8] git-remote-mediawiki: don't split namespaces with spaces

2012-07-16 Thread Junio C Hamano
Looks sensible. -- 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

[PATCH v2] Fix notes handling in rev-list

2012-07-16 Thread Jukka Lehtniemi
Display notes in the rev-list when switch '--notes' is used. Also expand notes place holder (%N) in user format. Previously rev-list ignored both of these. Signed-off-by: Jukka Lehtniemi --- Thanks for your feedback Peff! builtin/rev-list.c | 16 +++- t/t6006-rev-list-for

Re: [PATCH 0/8] git-remote-mediawiki: fixes, optimizations, and progress report

2012-07-16 Thread Junio C Hamano
Thanks for updates. Will queue on 'pu' as-is. -- 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: [ANN] SubGit 1.0.0 RC1

2012-07-16 Thread Junio C Hamano
Semen Vadishev writes: > Hello All, > > I'm glad to report that SubGit 1.0 RC1 is available for download at > http://subgit.com/ Where's the source? -- 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 htt

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

2012-07-16 Thread Junio C Hamano
Jukka Lehtniemi writes: > Display notes in the rev-list when switch '--notes' is used. > Also expand notes place holder (%N) in user format. > Previously rev-list ignored both of these. > > Signed-off-by: Jukka Lehtniemi > --- > > Thanks for your feedback Peff! If it is an update for some old p

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Michael Haggerty
On 07/16/2012 07:47 PM, Junio C Hamano wrote: Michael Haggerty writes: It's already supported: git config hooks.announcelist \ "n...@example.com, overwhel...@example.com, p...@example.com" git config hooks.refchangelist \ "n...@example.com, overwhel...@example.com"

Re: [ANN] SubGit 1.0.0 RC1

2012-07-16 Thread Semen Vadishev
Hello Junio, Where's the source? SubGit is a closed-source project. Semen Vadishev, TMate Software, http://subgit.com/ - git+svn on the server side! On 7/16/12 20:55, Junio C Hamano wrote: Semen Vadishev writes: Hello All, I'm glad to report that SubGit 1.0 RC1 is available for download

Re: [PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty

2012-07-16 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Signed-off-by: Matthieu Moy >> --- >> contrib/mw-to-git/git-remote-mediawiki | 9 - >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/contrib/mw-to-git/git-remote-mediawiki >> b/contrib/mw-to-git/git-remote-mediawik

Re: [ANN] SubGit 1.0.0 RC1

2012-07-16 Thread Junio C Hamano
Semen Vadishev writes: > Hello Junio, > >> Where's the source? > SubGit is a closed-source project. Ah, OK. As long as you are using Git in compliance with its licensing terms, it is perfectly fine to be commercial. But in that case, could you please mark your messages with [Ad] or [Advertisem

Re: [PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty

2012-07-16 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> >>> Signed-off-by: Matthieu Moy >>> --- >>> contrib/mw-to-git/git-remote-mediawiki | 9 - >>> 1 file changed, 8 insertions(+), 1 deletion(-) >>> >>> diff --git a/contrib/mw-to-git/git-remote-mediawiki >>> b/co

Re: [RFC] Add a new email notification script to "contrib"

2012-07-16 Thread Junio C Hamano
Michael Haggerty writes: > On 07/16/2012 07:47 PM, Junio C Hamano wrote: >> Michael Haggerty writes: >> >>> It's already supported: >>> >>> git config hooks.announcelist \ >>> "n...@example.com, overwhel...@example.com, p...@example.com" >>> git config hooks.refchangelist \ >>

Re: [PATCH 4/8] git-remote-mediawiki: get rid of O(N^2) loop

2012-07-16 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> The algorithm to find a path from the local revision to the remote one >> was calling "git rev-list" and parsing its output N times. Run rev-list >> only once, and fill a hashtable with the result to optimize the body of >> the loop. > > Good th

Re: [PATCH 3/8] git-remote-mediawiki: make mediafiles export optional

2012-07-16 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Signed-off-by: Matthieu Moy > > It would have been nicer to hint why people may want to omit > mediafiles from their export under what condition somewhere in the > documentation or at least in the proposed commit log message. The real use-case

[PATCH 0/8 v2] git-remote-mediawiki: fixes, optimizations, and progress report

2012-07-16 Thread Matthieu Moy
Changes since v1: more explanations in commit message for "make mediafiles export optional", and use --parents instead of --children in "get rid of O(N^2) loop". Matthieu Moy (8): git-remote-mediawiki: don't split namespaces with spaces git-remote-mediawiki: actually send empty comment when th

[PATCH 1/8] git-remote-mediawiki: don't split namespaces with spaces

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index accd70a..a6ad8cf 100755 --- a/contrib/mw-to-git/git-remote-mediawiki +

[PATCH 6/8] git-remote-mediawiki: show progress information when listing pages

2012-07-16 Thread Matthieu Moy
Initial phases of push and pull with git-remote-mediawiki can be long on a large wiki. Let the user know what's going on. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contri

[PATCH 5/8] git-remote-mediawiki: use --force when adding notes

2012-07-16 Thread Matthieu Moy
When notes are created to record a push, it normally doesn't exist yet. However, when a push is interrupted and then restarted, it may happen that a commit already has notes attached, and we want to reflect the newly created remote revision, hence use 'git notes add -f' to override the existing one

[PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index a6ad8cf..a2da52f 100755 --- a/contrib/mw-to-git/git-remote-med

[PATCH 8/8] git-remote-mediawiki: properly deal with invalid remote revisions

2012-07-16 Thread Matthieu Moy
Some wiki, including https://git.wiki.kernel.org/ have invalid revision numbers (i.e. the actual revision numbers are non-contiguous). Don't die when encountering one. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 13 + 1 file changed, 9 insertions(+), 4 de

[PATCH 4/8] git-remote-mediawiki: get rid of O(N^2) loop

2012-07-16 Thread Matthieu Moy
The algorithm to find a path from the local revision to the remote one was calling "git rev-list" and parsing its output N times. Run rev-list only once, and fill a hashtable with the result to optimize the body of the loop. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki

[PATCH 7/8] git-remote-mediawiki: show progress information when getting last remote revision

2012-07-16 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki index 729a0bc..8badff6 100755 --- a/contrib/mw-to-git/git-remote-mediawiki +++ b/contrib/m

[PATCH 3/8] git-remote-mediawiki: make mediafiles export optional

2012-07-16 Thread Matthieu Moy
It is possible to use git-remote-mediawiki on a tree with both .mw files and other files. Before git-remote-mediawiki learnt how to export mediafiles, such mixed trees allowed the user to maintain both the wiki and other files for the same project in the same repository. With the newly added suppor

Re: [PATCH 0/8 v2] git-remote-mediawiki: fixes, optimizations, and progress report

2012-07-16 Thread Junio C Hamano
Thanks; will replace and requeue. -- 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: [ANN] SubGit 1.0.0 RC1

2012-07-16 Thread Semen Vadishev
Where's the source? SubGit is a closed-source project. Ah, OK. As long as you are using Git in compliance with its licensing terms, it is perfectly fine to be commercial. We're careful to the licensing terms of the libraries SubGit is built upon. But in that case, could you please mark your m

Re: [PATCH] Escape file:// URL's to meet subversion SVN::Ra requirements

2012-07-16 Thread Michael Witten
On 2011-11-04 02:11:49 GMT, Ben Walton wrote: > Excerpts from Eric Wong's message of Wed Nov 02 18:09:41 -0400 2011: > > Hi Eric, > >> I don't have much time to help you fix it, but I got numerous errors >> on SVN 1.6.x (svn 1.6.12). Can you make sure things continue to >> work on 1.6 and earlie

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

2012-07-16 Thread Thomas Gummerer
== 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 do a binary search. The exact bits for each section were also defined. To further compress

[PATCH v2 0/8] Cleaning up t4012

2012-07-16 Thread Alexander Strasser
Hi, here goes the reroll. I corrected the spelling errors pointed out by Zbigniew and appended another patch for replacing the if-else "Did the command fail?" constructs with test_must_fail. I based this series on the as/t4012-style-updates branch pushed by Junio. So his fixes are included to

[PATCH v2 1/8] t4012: modernize style for quoting

2012-07-16 Thread Alexander Strasser
This quoting style is used by all newly added test code. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- t/t4012-diff-binary.sh | 35 --- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-bin

[PATCH v2 3/8] t4012: Actually quote the sed script

2012-07-16 Thread Alexander Strasser
The nested quoting is not needed in this cases, thus the previous version did work just fine. Nevertheless the usage is misleading, so just achieve nested quoting by using double quotes instead. Lower the probability of breakage in the future and make the code easier to read. NOTE: Just dropping t

[PATCH v2 4/8] t4012: Break up pipe into serial redirections

2012-07-16 Thread Alexander Strasser
Do not hide possible git errors by masking its process exit status. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- t/t4012-diff-binary.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 60c2f6c..daf

[PATCH v2 5/8] t4012: Make --shortstat test more robust

2012-07-16 Thread Alexander Strasser
The --shortstat test depends on the same scenario as the --stat test. Use the part of the same expected result for the --stat test to avoid duplicating it manually. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- t/t4012-diff-binary.sh | 4 ++-- 1 file changed, 2 insertions(

[PATCH v2 6/8] t4012: Re-indent test snippets

2012-07-16 Thread Alexander Strasser
Most one-level indents were 1 HT (horizontal tab) followed by 1 SP. Remove the SP. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- t/t4012-diff-binary.sh | 68 +- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/

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

2012-07-16 Thread Junio C Hamano
Thomas Gummerer 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 do a binary search. The exact bits > for each section we

[PATCH v2 7/8] t4012: use 'printf' instead of 'dd' to generate a binary file

2012-07-16 Thread Alexander Strasser
From: Johannes Sixt For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes on Windows instead of the expected 1026 bytes, so that a test fails. Since the actual contents of the file are irrelevant as long as there is at least one zero byte so that the diff machinery recognizes

[PATCH v2 8/8] t4012: Use test_must_fail instead of if-else

2012-07-16 Thread Alexander Strasser
Make the code less bulky and easier to read. Also do not overlook failures like e.g. git failing because of unexpected signals. Signed-off-by: Alexander Strasser --- t/t4012-diff-binary.sh | 16 ++-- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/t/t4012-diff-binary.s

[PATCH v2 2/8] t4012: Unquote git command fragment in test title

2012-07-16 Thread Alexander Strasser
The command fragments are quoted nowhere else in title texts of this file, thus make this one consistent with all other titles. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano --- t/t4012-diff-binary.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4012-

Re: [PATCH v2 0/8] Cleaning up t4012

2012-07-16 Thread Junio C Hamano
All looked reasonable; thanks folks. Will requeue and advance it to 'next'. -- 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] Fix overwritten remote ref on with fast-import.

2012-07-16 Thread Florian Achleitner
On Sunday 15 July 2012 19:30:25 Jonathan Nieder wrote: > Hi Florian, > > Florian Achleitner wrote: > > After importing new commits on top of refs/remotes/* the > > ref was overwritten with the local refs/heads/master, because the name > > of the remote reference to fetch, i.e. refs/heads/master, w

incremental updates to "What's cooking"

2012-07-16 Thread Junio C Hamano
Topics meant for the upcoming 1.7.12 have been maturing, and I am planning to tag 1.7.12-rc0 early next week. As a handful of topics have been rerolled since the last "What's cooking", here is an incremental updates. There are quite a few topics that are marked as "Expecting a reroll" in the last

Fix git-svn tests for SVN 1.7.5.

2012-07-16 Thread Michael G Schwern
Hi, I've fixed the git-svn tests for SVN 1.7 and tested with SVN 1.7.5. SVN 1.7 changed its expectations of path and URL formats and git-svn did not comply with them. The new code uses SVN's own canonicalization routines where available. This has been reported in several places... https://bugs.

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

2012-07-16 Thread Jakub Vrana
If external diff is specified through diff.external then it is used even if `git diff --no-ext-diff` is used when there is a typechange. Signed-off-by: Jakub Vrana --- diff.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index 208096f..898d610 100644 --- a/diff.c +++

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

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 12:03:40PM -0700, Junio C Hamano wrote: > Jukka Lehtniemi writes: > > > Display notes in the rev-list when switch '--notes' is used. > > Also expand notes place holder (%N) in user format. > > Previously rev-list ignored both of these. > > > > Signed-off-by: Jukka Lehtnie

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

2012-07-16 Thread Jonathan Nieder
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 right. The RHS of the refspec is supposed to be a _privat

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

2012-07-16 Thread Junio C Hamano
Jeff King writes: > ... But whatever we call it, I think it is an > improvement. I didn't say it makes things worse in any way, did I? I was reacting on the Subject: line because that will what I later have to work from when reading shortlog, summarizing changes, etc. > ... I don't think one m

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

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 09:30:09PM +0300, Jukka Lehtniemi wrote: > @@ -111,6 +112,7 @@ static void show_commit(struct commit *commit, void *data) > ctx.date_mode = revs->date_mode; > ctx.date_mode_explicit = revs->date_mode_explicit; > ctx.fmt = revs->comm

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

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 08:40:24PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > ... But whatever we call it, I think it is an > > improvement. > > I didn't say it makes things worse in any way, did I? No, you did not. That was my attempt to end the paragraph on a positive and constru

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

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 05:27:00PM -0700, Jakub Vrana wrote: > If external diff is specified through diff.external then it is used even if > `git diff --no-ext-diff` is used when there is a typechange. Eek. That has some minor security implications, as it means that it is dangerous to run even pl

Re: Bug: fatal: patch fragment without header at line

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 07:06:51PM +0530, tuxdna wrote: > Git version: git-1.7.7.6-1.fc16.x86_64 > > I am getting an error with a patch that I am applying to a git repository. > I have created a test case for this issue that I am facing. > > $ git apply --check 0001-modified-README.patch > fatal

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

2012-07-16 Thread Junio C Hamano
Jeff King writes: > On Mon, Jul 16, 2012 at 09:30:09PM +0300, Jukka Lehtniemi wrote: > >> @@ -111,6 +112,7 @@ static void show_commit(struct commit *commit, void >> *data) >> ctx.date_mode = revs->date_mode; >> ctx.date_mode_explicit = revs->date_mode_explicit; >>