Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Felipe Contreras
On Wed, Nov 28, 2012 at 8:36 AM, Junio C Hamano wrote: > Christian Couder writes: > >> All the python scripts except contrib/svn-fe/svnrdump_sim.py >> start with "#!/usr/bin/env python". >> >> This patch fix contrib/svn-fe/svnrdump_sim.py to do the same. > > I suspect you need a bit more than tha

Re: Millisecond precision in timestamps?

2012-11-28 Thread David Aguilar
On Tue, Nov 27, 2012 at 11:58 PM, Eric S. Raymond wrote: > Junio C Hamano : >> Roundtrip conversions may benefit from sub-second timestamps, but >> personally I think negative timestamps are more interesting and of >> practical use. > > You mean, as in times before the Unix epoch 1970-01-01T00:00:

Re: Millisecond precision in timestamps?

2012-11-28 Thread Thomas Berg
On Wed, Nov 28, 2012 at 8:29 AM, Junio C Hamano wrote: > Jeff King writes: > >> There is room for new headers, and older versions of git will ignore >> them. You could add a new "committer-timestamp" field that elaborates on >> the timestamp included on the committer line. Newer versions of git >

Re: Millisecond precision in timestamps?

2012-11-28 Thread Felipe Contreras
On Wed, Nov 28, 2012 at 9:19 AM, Thomas Berg wrote: > On Wed, Nov 28, 2012 at 8:29 AM, Junio C Hamano wrote: >> Jeff King writes: >> >>> There is room for new headers, and older versions of git will ignore >>> them. You could add a new "committer-timestamp" field that elaborates on >>> the times

Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Christian Couder
On Wed, Nov 28, 2012 at 9:03 AM, Felipe Contreras wrote: > On Wed, Nov 28, 2012 at 8:36 AM, Junio C Hamano wrote: >> Christian Couder writes: >> >>> All the python scripts except contrib/svn-fe/svnrdump_sim.py >>> start with "#!/usr/bin/env python". >>> >>> This patch fix contrib/svn-fe/svnrdump

Re: Millisecond precision in timestamps?

2012-11-28 Thread Thomas Berg
On Wed, Nov 28, 2012 at 9:44 AM, Felipe Contreras wrote: >> If roundtripping to other version control systems is an argument, >> adding sub-second timestamps could potentially create as many problems >> as it solves. For example, I've been using the hg-git bridge, and it >> supports roundtripping

Re: Possible vulnerability to SHA-1 collisions

2012-11-28 Thread Andreas Ericsson
On 11/28/2012 01:27 AM, Jeff King wrote: > On Tue, Nov 27, 2012 at 06:30:17PM -0500, Aaron Schrab wrote: > >> At 18:07 -0500 27 Nov 2012, Jeff King wrote: >>> PS I also think the OP's "sockpuppet creates innocuous bugfix" above is >>> easier said than done. We do not have SHA-1 collisions yet,

Re: Millisecond precision in timestamps?

2012-11-28 Thread Andreas Ericsson
On 11/28/2012 08:29 AM, Junio C Hamano wrote: > Jeff King writes: > >> There is room for new headers, and older versions of git will ignore >> them. You could add a new "committer-timestamp" field that elaborates on >> the timestamp included on the committer line. Newer versions of git >> would r

Re: Millisecond precision in timestamps?

2012-11-28 Thread Andreas Ericsson
On 11/28/2012 09:04 AM, David Aguilar wrote: > On Tue, Nov 27, 2012 at 11:58 PM, Eric S. Raymond wrote: >> Junio C Hamano : >>> Roundtrip conversions may benefit from sub-second timestamps, but >>> personally I think negative timestamps are more interesting and of >>> practical use. >> >> You mean

Re: git-svn: What is --follow-parent / --no-follow-parent for?

2012-11-28 Thread Steven Michalske
On Nov 19, 2012, at 11:31 PM, Sebastian Leske wrote: > > Commit graph of git-svn result: > > --follow-parent: --no-follow-parent: > > > | | > /| | | > / | | | > | |

Re: [PATCH] configure.ac: fix pthreads detection on Mac OS X

2012-11-28 Thread Max Horn
On 28.11.2012, at 07:38, Junio C Hamano wrote: > Max Horn writes: > >> The configure script checks whether certain flags are required to use >> pthreads. But it did not consider that *none* might be needed (as is the >> case on Mac OS X). This lead to configure adding "-mt" to the list of >> fl

Re: git config key bug or by design?

2012-11-28 Thread Peter van der Does
On Tue, 27 Nov 2012 22:34:09 -0500 Jeff King wrote: > > I don't recall ever discussing it. But what is it that you want to > store in a key starting with a number? Git does not respect any such > config values[1]. > > Are you writing a new tool that will store its config alongside git's? > Even

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option (summary)

2012-11-28 Thread W. Trevor King
On Tue, Nov 27, 2012 at 09:42:05PM -0500, W. Trevor King wrote: > On Wed, Nov 28, 2012 at 12:28:58AM +0100, Heiko Voigt wrote: > > https://github.com/hvoigt/git/commits/hv/floating_submodules_draft > > I looked over this before, but maybe not thoroughly enough ;). Heiko pointed out that I likely

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
* Piotr Krukowiecki [2012-11-28 11:03:29 +0100]: > Hi, > > when I set PROMPT_COMMAND to __git_ps1 I get a space at the beginning: > Is your setting?: PROMPT_COMMAND=__git_ps1 I believe you need to give 2 parameters in order to use it in PROMPT_COMMAND mode. In my .bashrc I have: if [ -f ~/.

git fetch pack freezes

2012-11-28 Thread Ivan Kanis
Hello, We are using git with the smart HTTP protocol. We are seeing the client freeze with Jenkins poll. It stops the continuous build which is a bit of a pain. It happens with the latest release 1.8.0 on the client side. The server is using 1.7.0.4. On the server we are seeing the following erro

Re: [PATCH 1/4] git-svn: Document branches with at-sign(@).

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 18.11.2012 18:08: > git svn will sometimes create branches with an at-sign in the name > (branchname@revision). These branches confuse many users and it is a FAQ > why they are created. Document when git svn will create them. > > Signed-off-by: Sebastian Leske

Re: [PATCH 2/4] Recommend use of structure options for git svn.

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 21.11.2012 08:13: > Document that when using git svn, one should usually either use the > directory structure options to import branches as branches, or only > import one subdirectory. The default behaviour of cloning all branches > and tags as subdirectories in

Re: [PATCH 3/4] git-svn: Expand documentation for --follow-parent

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 23.11.2012 08:13: > Describe what the option --follow-parent does, and what happens if it is > set or unset. > > Signed-off-by: Sebastian Leske > --- > Documentation/git-svn.txt | 16 > 1 file changed, 12 insertions(+), 4 deletions(-) > > d

Re: [PATCH 4/4] git-svn: Note about tags.

2012-11-28 Thread Michael J Gruber
Sebastian Leske venit, vidit, dixit 23.11.2012 08:29: > Document that 'git svn' will import SVN tags as branches. > > Signed-off-by: Sebastian Leske > --- > Documentation/git-svn.txt |6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/Documentation/git-svn.txt b/Documentation/git-

Re: Python extension commands in git - request for policy change

2012-11-28 Thread Magnus Bäck
On Tuesday, November 27, 2012 at 19:10 EST, Felipe Contreras wrote: > On Tue, Nov 27, 2012 at 3:35 PM, Magnus Bäck wrote: > > > While "constant traffic" probably overstates the issue, these are > > not theoretical problems. I recall at least three cases in the last > > year or so where Git

Re: git fetch pack freezes

2012-11-28 Thread Shawn Pearce
On Wed, Nov 28, 2012 at 6:12 AM, Ivan Kanis wrote: > We are using git with the smart HTTP protocol. We are seeing the client > freeze with Jenkins poll. It stops the continuous build which is a bit > of a pain. It happens with the latest release 1.8.0 on the client side. > The server is using 1.7.

Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

2012-11-28 Thread Junio C Hamano
Johannes Sixt writes: > Am 11/28/2012 0:00, schrieb Kacper Kornet: >> When the changes are pushed upstream, and in the meantime someone else >> updated upstream branch git advises to use git pull. This results in >> history: >> >> ---A---B---C-- >> \ / >> D---E > > Th

Re: [PATCH v4 0/4] git-submodule add: Add --local-branch option (summary)

2012-11-28 Thread W. Trevor King
On Wed, Nov 28, 2012 at 08:09:03AM -0500, W. Trevor King wrote: > * A new 'submodule pull' for tracking the submodule's remote, which is > pulling --ff-only origin/$branch into a whatever state the submodule > is currently in. If any changes were made to submodule $shas, > optionally commit

Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Junio C Hamano
Christian Couder writes: > On Wed, Nov 28, 2012 at 9:03 AM, Felipe Contreras > wrote: >> On Wed, Nov 28, 2012 at 8:36 AM, Junio C Hamano wrote: >>> Christian Couder writes: >>> All the python scripts except contrib/svn-fe/svnrdump_sim.py start with "#!/usr/bin/env python".

Re: [PATCH] push: cleanup push rules comment

2012-11-28 Thread Junio C Hamano
Chris Rorvick writes: > --- > > I ended up rewriting most of the comment. The new version removes > inter-rule dependencies (e.g., rule 5 overrides rule 3) which I think > makes it more readable. Nice; thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a me

Re: git fetch pack freezes

2012-11-28 Thread Ivan Kanis
Hi Shawn, Thanks for the quick reply. Shawn Pearce wrote: > On Wed, Nov 28, 2012 at 6:12 AM, Ivan Kanis wrote: >> >> On the server we are seeing the following error message: > > Upgrade your server. OK we'll look into it. I have a question: will a 1.8 server still serve 1.7 git client? > So

Re: [PATCH v3 5/7] remote-bzr: add simple tests

2012-11-28 Thread Junio C Hamano
Felipe Contreras writes: > Signed-off-by: Felipe Contreras > --- > contrib/remote-helpers/test-bzr.sh | 111 > + > 1 file changed, 111 insertions(+) > create mode 100755 contrib/remote-helpers/test-bzr.sh > > diff --git a/contrib/remote-helpers/test-bzr.sh

Re: [PATCH v3 4/7] remote-bzr: update working tree

2012-11-28 Thread Junio C Hamano
Felipe Contreras writes: > Signed-off-by: Felipe Contreras > --- > contrib/remote-helpers/git-remote-bzr | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/contrib/remote-helpers/git-remote-bzr > b/contrib/remote-helpers/git-remote-bzr > index 2c05f35..5b89a05 100755 > --- a/contrib/re

Re: Millisecond precision in timestamps?

2012-11-28 Thread Junio C Hamano
Thomas Berg writes: > If roundtripping to other version control systems is an argument, > adding sub-second timestamps could potentially create as many problems > as it solves. For example, I've been using the hg-git bridge, and it > supports roundtripping between git and mercurial today (for mos

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Piotr Krukowiecki
Re-sending mail. On Wed, Nov 28, 2012 at 7:02 PM, Piotr Krukowiecki wrote: > > On Wed, Nov 28, 2012 at 2:20 PM, Simon Oosthoek wrote: >> >> * Piotr Krukowiecki [2012-11-28 11:03:29 >> +0100]: >> >> > Hi, >> > >> > when I set PROMPT_COMMAND to __git_ps1 I get a space at the beginning: >> > >> >

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-11-28 Thread Ralf Thielow
> Hi Ralf, > > This is the middle third of my review. Sorry for the long wait! I hope > it can still be useful. > Hi Thomas, no problem. Thanks for your review. Of course it's very useful. Some of the mistakes I made are so obvious that I can't say what I've had in mind when translation these m

[PATCH 0/5] jk/send-email-sender-prompt loose ends

2012-11-28 Thread Jeff King
Here are the cleanups and refactorings split out from my jk/send-email-sender-prompt series. They can go right on master and are independent of Felipe's fc/send-email-no-sender-prompt topic. [1/5]: test-lib: allow negation of prerequisites Same as before. I think this is a useful feature for th

[PATCH 1/5] test-lib: allow negation of prerequisites

2012-11-28 Thread Jeff King
You can set and test a prerequisite like this: test_set_prereq FOO test_have_prereq FOO && echo yes You can negate the test in the shell like this: ! test_have_prereq && echo no However, when you are using the automatic prerequisite checking in test_expect_*, there is no opportunity to us

[PATCH 2/5] t7502: factor out autoident prerequisite

2012-11-28 Thread Jeff King
t7502 checks the behavior of commit when we can and cannot determine a valid committer ident. Let's move that into test-lib as a lazy prerequisite so other scripts can use it. Signed-off-by: Jeff King --- t/t7502-commit.sh | 12 +--- t/test-lib.sh | 6 ++ 2 files changed, 7 inse

[PATCH 3/5] ident: make user_ident_explicitly_given static

2012-11-28 Thread Jeff King
In v1.5.6-rc0~56^2 (2008-05-04) "user_ident_explicitly_given" was introduced as a global for communication between config, ident, and builtin-commit. In v1.7.0-rc0~72^2 (2010-01-07) readers switched to using the common wrapper user_ident_sufficiently_given(). After v1.7.11-rc1~15^2~18 (2012-05-21

[PATCH 4/5] ident: keep separate "explicit" flags for author and committer

2012-11-28 Thread Jeff King
We keep track of whether the user ident was given to us explicitly, or if we guessed at it from system parameters like username and hostname. However, we kept only a single variable. This covers the common cases (because the author and committer will usually come from the same explicit source), but

[PATCH 5/5] t: add tests for "git var"

2012-11-28 Thread Jeff King
We do not currently have any explicit tests for "git var" at all (though we do exercise it to some degree as a part of other tests). Let's add a few basic sanity checks. Signed-off-by: Jeff King --- t/t0007-git-var.sh | 49 + 1 file changed, 49 ins

[PATCH] completion: add options --single-branch and --branch to "git clone"

2012-11-28 Thread Ralf Thielow
Signed-off-by: Ralf Thielow --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 48c3abd..cda095d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/co

[PATCH] submodule update: document exisiting -r form for --rebase

2012-11-28 Thread W. Trevor King
From: "W. Trevor King" Signed-off-by: W. Trevor King --- Documentation/git-submodule.txt | 3 ++- git-submodule.sh| 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b4683bb..ec78fa7 10064

[PATCH 6/5] t9001: check send-email behavior with implicit sender

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 01:25:35PM -0500, Jeff King wrote: > Here are the cleanups and refactorings split out from my > jk/send-email-sender-prompt series. They can go right on master and are > independent of Felipe's fc/send-email-no-sender-prompt topic. > [...] > Dropped were: > [...] > - send

Re: [PATCH 6/5] t9001: check send-email behavior with implicit sender

2012-11-28 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 28, 2012 at 01:25:35PM -0500, Jeff King wrote: > >> Here are the cleanups and refactorings split out from my >> jk/send-email-sender-prompt series. They can go right on master and are >> independent of Felipe's fc/send-email-no-sender-prompt topic. >> [...] >> Drop

Re: [PATCH] completion: add options --single-branch and --branch to "git clone"

2012-11-28 Thread Junio C Hamano
Ralf Thielow writes: > Signed-off-by: Ralf Thielow > --- > contrib/completion/git-completion.bash | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/contrib/completion/git-completion.bash > b/contrib/completion/git-completion.bash > index 48c3abd..cda095d 100644 > --- a/contrib/complet

Re: [PATCH] submodule update: document exisiting -r form for --rebase

2012-11-28 Thread Junio C Hamano
"W. Trevor King" writes: > From: "W. Trevor King" > > Signed-off-by: W. Trevor King > --- > Documentation/git-submodule.txt | 3 ++- > git-submodule.sh| 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) Hmm, I wonder why I have this funny feeling that this was proposed

Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Felipe Contreras
On Wed, Nov 28, 2012 at 5:57 PM, Junio C Hamano wrote: > Christian Couder writes: > >> On Wed, Nov 28, 2012 at 9:03 AM, Felipe Contreras >> wrote: >>> That works if somebody managed to export PYTHON_PATH, which very very >>> often is not the case for me. >> >> Yeah, and even if PYTHON_PATH is u

Re: git fetch pack freezes

2012-11-28 Thread Shawn Pearce
On Wed, Nov 28, 2012 at 9:25 AM, Ivan Kanis wrote: > Shawn Pearce wrote: > >> On Wed, Nov 28, 2012 at 6:12 AM, Ivan Kanis >> wrote: >>> >>> On the server we are seeing the following error message: >> >> Upgrade your server. > > OK we'll look into it. I have a question: will a 1.8 server still s

[PATCH v5 2/2] submodule add: If --branch is given, record it in .gitmodules

2012-11-28 Thread W. Trevor King
From: "W. Trevor King" This allows you to easily record a submodule..branch option in .gitmodules when you add a new submodule. With this patch, $ git submodule add -b [] $ git config -f .gitmodules submodule..branch reduces to $ git submodule add -b [] This means that future call

[PATCH v5 1/2] submodule update: add --remote for submodule's upstream changes

2012-11-28 Thread W. Trevor King
From: "W. Trevor King" The current `update` command incorporates the superproject's gitlinked SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the options you use, it may checkout $sha1, rebase the $subsha1 onto $sha1, or merge $sha1 into $subsha1. This helps you keep up with chan

[PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-11-28 Thread W. Trevor King
From: "W. Trevor King" On Wed, Nov 28, 2012 at 11:53:34AM -0500, W. Trevor King wrote: > I thought of a better idea on the train. How about adding `--remote` > to `submodule update` that overrides the gitlinked SHA-1 with the > SHA-1 for origin/$branch? All of the other checkout/merge/rebase >

Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Junio C Hamano
Felipe Contreras writes: > On Wed, Nov 28, 2012 at 5:57 PM, Junio C Hamano wrote: > ... >> You need a fix for that; didn't I already say "you need a bit more >> than that"? > > I disagree. Most of the contrib scripts are expected to be used as > they are. You are only looking at one of the uses

Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-28 Thread W. Trevor King
On Wed, Nov 28, 2012 at 11:02:45AM -0800, Junio C Hamano wrote: > "W. Trevor King" writes: > > > From: "W. Trevor King" > > > > Signed-off-by: W. Trevor King > > --- > > Documentation/git-submodule.txt | 3 ++- > > git-submodule.sh| 2 +- > > 2 files changed, 3 insertions(+), 2

What's cooking in git.git (Nov 2012, #09; Wed, 28)

2012-11-28 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Hopefully 1.8.1-rc0 preview will be tagged this weekend. Many topics are marked to be cooked in 'next' during the feature freeze, but some topi

Re: [PATCH 6/5] t9001: check send-email behavior with implicit sender

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 10:55:02AM -0800, Junio C Hamano wrote: > > +test_expect_success $PREREQ,AUTOIDENT 'implicit ident is allowed' ' > > + clean_fake_sendmail && > > + (sane_unset GIT_AUTHOR_NAME && > > + sane_unset GIT_AUTHOR_EMAIL && > > + sane_unset GIT_COMMITTER_NAME && > >

Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option

2012-11-28 Thread Junio C Hamano
"W. Trevor King" writes: >> As the command takes other options whose names begin with 'r', I >> thought the longer term plan was to stop letting "--rebase" squat on >> short and sweet "-r" and leaving it undocumented (even though the >> short one was added by mistake) was meant to be the first st

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
On 28/11/12 19:02, Piotr Krukowiecki wrote: > Is your setting?: > PROMPT_COMMAND=__git_ps1 > > > That's right > > > I believe you need to give 2 parameters in order to use it in > PROMPT_COMMAND mode. > > > Are you sure? git-prompt.sh says: > > #3a) In ~/.bashrc set PROM

Re: [PATCH 6/5] t9001: check send-email behavior with implicit sender

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 03:06:26PM -0500, Jeff King wrote: > Here's a cleaned up version that makes it more obvious the commands are > the same (it also fixes a few minor whitespace problems on the > indentation, which you can see from the quoting above). I wondered how painful it would be to act

Re: git config key bug or by design?

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 07:11:47AM -0500, Peter van der Does wrote: > I am writing a tool, it needs to store branch names in a separate config > file. > > It's clear git doesn't respect those values, hence my question. I > understand how to work around the problem, I would just prefix the key. >

Re: [PATCH v6 07/16] remote-hg: add support for hg-git compat mode

2012-11-28 Thread W. Trevor King
I'm not sure if this is the most recent patch iteration for this feature, but I just saw this typo in `pu`. On Sun, Nov 04, 2012 at 03:13:29AM +0100, Felipe Contreras wrote: > +# Commits are modified to preserve hg information and allow biridectionality.

Re: What's cooking in git.git (Nov 2012, #09; Wed, 28)

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 11:54:27AM -0800, Junio C Hamano wrote: > * jk/fsck-dot-in-trees (2012-11-28) 1 commit > - fsck: warn about '.' and '..' in trees > > Will merge to 'next'. Do you have an opinion on warning about '.git', as well? It probably would make more sense as a patch on top, but

Re: [PATCH 6/5] t9001: check send-email behavior with implicit sender

2012-11-28 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 28, 2012 at 03:06:26PM -0500, Jeff King wrote: > >> Here's a cleaned up version that makes it more obvious the commands are >> the same (it also fixes a few minor whitespace problems on the >> indentation, which you can see from the quoting above). > > I wondered h

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Junio C Hamano
Simon Oosthoek writes: > perhaps the point should read like this: > #3a) In ~/.bashrc set PROMPT_COMMAND > #To customize the prompt, provide start/end arguments > #PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "' > > Which would not be confusing at all, I think... It says "to cu

Re: git-prompt.sh vs leading white space in __git_ps1()::printf_format

2012-11-28 Thread Simon Oosthoek
On 28/11/12 21:47, Junio C Hamano wrote: > Simon Oosthoek writes: > >> perhaps the point should read like this: >> #3a) In ~/.bashrc set PROMPT_COMMAND >> #To customize the prompt, provide start/end arguments >> #PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "' >> >> Which would

Re: git-svn: What is --follow-parent / --no-follow-parent for?

2012-11-28 Thread Eric Wong
Sebastian Leske wrote: > However, this does not make sense to me: This sounds like there is no > good reason *not* to enable this option. So why is it there? And in > what situation might I want to use "--no-follow-parent"? Speed. Following long/convoluted histories can take a long time. Someti

Re: What's cooking in git.git (Nov 2012, #09; Wed, 28)

2012-11-28 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 28, 2012 at 11:54:27AM -0800, Junio C Hamano wrote: > >> * jk/fsck-dot-in-trees (2012-11-28) 1 commit >> - fsck: warn about '.' and '..' in trees >> >> Will merge to 'next'. > > Do you have an opinion on warning about '.git', as well? It probably > would make mo

Re: [PATCH] svnrdump_sim: start the script with /usr/bin/env python

2012-11-28 Thread Felipe Contreras
On Wed, Nov 28, 2012 at 8:33 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Wed, Nov 28, 2012 at 5:57 PM, Junio C Hamano wrote: >> ... >>> You need a fix for that; didn't I already say "you need a bit more >>> than that"? >> >> I disagree. Most of the contrib scripts are expected t

[PATCH] fsck: warn about ".git" in trees

2012-11-28 Thread Jeff King
On Wed, Nov 28, 2012 at 01:25:05PM -0800, Junio C Hamano wrote: > >> * jk/fsck-dot-in-trees (2012-11-28) 1 commit > >> - fsck: warn about '.' and '..' in trees > >> > >> Will merge to 'next'. > > > > Do you have an opinion on warning about '.git', as well? It probably > > would make more sense

Re: [PATCH 0/5] jk/send-email-sender-prompt loose ends

2012-11-28 Thread Felipe Contreras
On Wed, Nov 28, 2012 at 7:25 PM, Jeff King wrote: > Here are the cleanups and refactorings split out from my > jk/send-email-sender-prompt series. They can go right on master and are > independent of Felipe's fc/send-email-no-sender-prompt topic. > > [1/5]: test-lib: allow negation of prerequisi

[PATCH v7 p1 00/13] fast-export and remote-testgit improvements

2012-11-28 Thread Felipe Contreras
Hi, Basically the same as v6, except the last patch was dropped, and testgit switched to '#!/usr/bin/env bash'. Shouldn't break any tests now. Felipe Contreras (13): fast-export: avoid importing blob marks remote-testgit: fix direction of marks remote-helpers: fix failure message Rename

[PATCH v7 p1 01/13] fast-export: avoid importing blob marks

2012-11-28 Thread Felipe Contreras
We want to be able to import, and then export, using the same marks, so that we don't push things that the other side already received. Unfortunately, fast-export doesn't store blobs in the marks, but fast-import does. This creates a mismatch when fast export is reusing a mark that was previously

[PATCH v7 p1 02/13] remote-testgit: fix direction of marks

2012-11-28 Thread Felipe Contreras
Basically this is what we want: == pull == testgit transport-helper * export -> import # testgit.marks git.marks == push == testgit transport-helper * import<- export # te

[PATCH v7 p1 03/13] remote-helpers: fix failure message

2012-11-28 Thread Felipe Contreras
This is remote-testgit, not remote-hg. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- t/t5800-remote-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh index e7dc668..d46fa40 100755 --- a/t/

[PATCH v7 p1 05/13] Add new simplified git-remote-testgit

2012-11-28 Thread Felipe Contreras
Exercising the python remote helper framework is for another tool and another test. This is about testing the remote-helper interface. It's way simpler, it exercises the same features of remote helpers, it's easy to read and understand, and it doesn't depend on python. For now let's just copy the

[PATCH v7 p1 06/13] remote-testgit: remove non-local functionality

2012-11-28 Thread Felipe Contreras
This only makes sense for the python remote helpers framework. The tests don't exercise any feature of transport helper. Remove them. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- git-remote-testgit| 3 --- t/t5801-remote-helpers.sh | 50

[PATCH v7 p1 07/13] remote-testgit: remove irrelevant test

2012-11-28 Thread Felipe Contreras
This was only to cover a bug that was fixed in remote-testpy not to resurface. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- t/t5801-remote-helpers.sh | 13 - 1 file changed, 13 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh inde

[PATCH v7 p1 08/13] remote-testgit: cleanup tests

2012-11-28 Thread Felipe Contreras
We don't need a bare 'server' and an intermediary 'public'. The repos can talk to each other directly; that's what we want to exercise. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- t/t5801-remote-helpers.sh | 63 ++- 1 file change

[PATCH v7 p1 09/13] remote-testgit: exercise more features

2012-11-28 Thread Felipe Contreras
Unfortunately a lot of these tests fail. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- git-remote-testgit| 38 +++--- t/t5801-remote-helpers.sh | 52 +++ 2 files changed, 78 insertions(+), 12 del

[PATCH v7 p1 10/13] remote-testgit: report success after an import

2012-11-28 Thread Felipe Contreras
Doesn't make a difference for the tests, but it does for the ones seeking reference. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- git-remote-testgit | 13 + 1 file changed, 13 insertions(+) diff --git a/git-remote-testgit b/git-remote-testgit index efda74b..6fb

[PATCH v7 p1 11/13] remote-testgit: implement the "done" feature manually

2012-11-28 Thread Felipe Contreras
People who want to write their own remote-helper will find it more useful to see clearly how they are supposed to advertise and implement the "done" feature themselves. Right now we are relying on fast-export to do that by using the --use-done-feature argument. However, people writing their own re

[PATCH v7 p1 12/13] fast-export: trivial cleanup

2012-11-28 Thread Felipe Contreras
Setting 'commit' to 'commit' is a no-op. It might have been there to avoid a compiler warning, but if so, it was the compiler to blame, and it's certainly not there any more. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- builtin/fast-export.c | 2 +- 1 file changed, 1 insert

[PATCH v7 p1 04/13] Rename git-remote-testgit to git-remote-testpy

2012-11-28 Thread Felipe Contreras
This script is not really exercising the remote-helper functionality, but more the python framework for remote helpers that live in git_remote_helpers. It's also not a good example of how to write remote-helpers, unless you are planning to use python, and even then you might not want to use this f

[PATCH v7 p2 0/2] fast-export fixes

2012-11-28 Thread Felipe Contreras
Hi, Here's version 7 part 2; I've dropped all the unnecessary patches, nobody seems to care about the current brokedness, and I did them only to show that these are correct, and that remote helpers without marks just don't work. These are the ones I care about. Below is a summary of what happens

[PATCH v7 p2 2/2] fast-export: make sure updated refs get updated

2012-11-28 Thread Felipe Contreras
When an object has already been exported (and thus is in the marks) it's flagged as SHOWN, so it will not be exported again, even if in a later time it's exported through a different ref. We don't need the object to be exported again, but we want the ref updated, which doesn't happen. Since we ca

[PATCH v7 p2 1/2] fast-export: don't handle uninteresting refs

2012-11-28 Thread Felipe Contreras
They have been marked as UNINTERESTING for a reason, lets respect that. Currently the first ref is handled properly, but not the rest: % git fast-export master ^uninteresting ^foo ^bar reset refs/heads/bar from :0 reset refs/heads/foo from :0 reset refs/heads/uninteresting from :0

Re: git-svn: What is --follow-parent / --no-follow-parent for?

2012-11-28 Thread Sebastian Leske
Hi Steven, hi Eric, thanks for your explanations. I'll try to update my doc patch to include them. -- 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 04/11] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2012-11-28 Thread Junio C Hamano
Brandon Casey writes: > -static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) > +static int is_rfc2822_line(const char *buf, int len) > +{ > + int i; > + > + for (i = 0; i < len; i++) { > + int ch = buf[i]; > + if (ch == ':') > +

Re: [PATCH 06/11] sequencer.c: teach append_signoff how to detect duplicate s-o-b

2012-11-28 Thread Junio C Hamano
Brandon Casey writes: > +/* Returns 0 for non-conforming footer Please format it like this: /* * Returns 0 for ... > + * Returns 1 for conforming footer > + * Returns 2 when sob exists within conforming footer > + * Returns 3 when sob exists within conforming footer as last entry > + */ > +st

Re: [PATCH v7 p2 1/2] fast-export: don't handle uninteresting refs

2012-11-28 Thread Max Horn
On 28.11.2012, at 23:23, Felipe Contreras wrote: > They have been marked as UNINTERESTING for a reason, lets respect that. > > Currently the first ref is handled properly, but not the rest: > > % git fast-export master ^uninteresting ^foo ^bar All these refs are assumed to point to the same o

Please pull l10n updates for 1.8.1 round 1

2012-11-28 Thread Jiang Xin
Hi, Junio The following changes since commit 2d242fb3fc19fc9ba046accdd9210be8b9913f64: Update draft release notes for 1.8.1 (2012-11-21 13:32:58 -0800) are available in the git repository at: git://github.com/git-l10n/git-po.git master for you to fetch changes up to 647d5183b8dc36b38d19c7a

Re: [PATCH 04/11] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

2012-11-28 Thread Brandon Casey
On 11/28/2012 4:02 PM, Junio C Hamano wrote: Brandon Casey writes: -static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) +static int is_rfc2822_line(const char *buf, int len) +{ + int i; + + for (i = 0; i < len; i++) { + int ch = buf[i]; +

Re: [PATCH 00/11] alternative unify appending of sob

2012-11-28 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Mon, Nov 26, 2012 at 8:45 AM, Brandon Casey wrote: > >> I've integrated Duy's series with a few minor tweaks. I added a couple >> of additional tests to t4014 and corrected one of the tests which had >> incorrect behavior. I think his sign-off's should still b

Re: Please pull l10n updates for 1.8.1 round 1

2012-11-28 Thread Junio C Hamano
Thanks. -- 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

reposurgeon now writes Subversion repositories

2012-11-28 Thread Eric S. Raymond
This is something that probably doesn't happen very often - cross-posting to the Subversion and git dev lists that is on-topic for both :-). The repo head version of reposurgeon can now write Subversion repositories from its common git-import-stream-based representation of repository histories, as

Re: Millisecond precision in timestamps?

2012-11-28 Thread Eric S. Raymond
Steven Michalske : > Would having arbitrary key value pairs be useful in the git data > model? We could have ones that affect the sha1 and others that are > transparent. My tools would have several uses for these. bzr's implementation of import streams has a commit-propperties extension. reposur

Re: Millisecond precision in timestamps?

2012-11-28 Thread Junio C Hamano
Steven Michalske writes: > Would having arbitrary key value pairs be useful in the git data > model? My answer to the question is that it is harmful to the data model, but the benefit of going against the data model _may_ outweigh the downside. It is all relative. The first of very small numbe

Re: Millisecond precision in timestamps?

2012-11-28 Thread Felipe Contreras
On Thu, Nov 29, 2012 at 8:11 AM, Junio C Hamano wrote: > Steven Michalske writes: > >> Would having arbitrary key value pairs be useful in the git data >> model? > > My answer to the question is that it is harmful to the data model, > but the benefit of going against the data model _may_ outweigh

RE: Please pull l10n updates for 1.8.1 round 1

2012-11-28 Thread Trần Ngọc Quân
Hello JX, You missing pull from my repo (2 commits instead of one, v1.7 and v1.8): dcc52a0449c7ee10690e23152e63b9798f8a332f $ git log -n 2 commit dcc52a0449c7ee10690e23152e63b9798f8a332f Author: Tran Ngoc Quan Date: Sat Nov 24 07:37:35 2012 +0700 l10n: vi.po: Update follow git-v1.8.0-273-