Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Junio C Hamano
Jeff King p...@peff.net writes: @@ -175,6 +177,11 @@ static int estimate_similarity(struct diff_filespec *src, if (max_size * (MAX_SCORE-minimum_score) delta_size * MAX_SCORE) return 0; + hashcpy(pair.one, src-sha1); + hashcpy(pair.two, dst-sha1); + if

Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: Yes. This is probably cosmetics only, but without path information, we leave it to chance to decide which A to pair with B and C (in the A-B, A-C case above). Wrong path might lead to funny effects (i'm thinking of git log --follow). Isn't that

Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Nguyen Thai Ngoc Duy
On Wed, Aug 1, 2012 at 1:09 PM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: Yes. This is probably cosmetics only, but without path information, we leave it to chance to decide which A to pair with B and C (in the A-B, A-C case above). Wrong path

Re: Broken git-svn tests known?

2012-08-01 Thread Frans Klaver
On Wed, Aug 1, 2012 at 1:44 AM, Ammon Riley ammon.ri...@gmail.com wrote: Hi, On a freshly checked out copy of the maint branch (0e4c8822), the t9100-git-svn-basic.sh tests are failing 21 of 25 tests. Is this known, or am I missing some dependencies? Is it possibly due to using subversion

Re: Need help to complete the proposed gsoc 2012 project

2012-08-01 Thread jaseem abid
On Wed, Aug 1, 2012 at 4:52 AM, Andrew Ardill andrew.ard...@gmail.com wrote: On Wednesday, August 1, 2012, jaseem abid wrote: [...] Any help will be greatly appreciated. Was there anything in particular you wanted help with: code review, fixing bugs, implementing features? 1. Code

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-01 Thread Florian Achleitner
On Tuesday 31 July 2012 15:43:57 Jonathan Nieder wrote: Florian Achleitner wrote: I haven't tried that yet, nor do I remember anything where I've already seen two processes writing to the same pipe. It's a perfectly normal and well supported thing to do. I played around with a little

Re: My Personal datavault (Mypdv)

2012-08-01 Thread obaid4u
This is the best site for storing all your docs online and 100% secure too. I have uploaded the docs n t very easy to access -- View this message in context: http://git.661346.n2.nabble.com/My-Personal-datavault-Mypdv-tp7562340p7564235.html Sent from the git mailing list archive at

Cherry-picking commits with empty messages

2012-08-01 Thread Chris Webb
Whilst doing some extra sanity checking of my git-rebase--interactive.sh patch yesterday, I came across a behaviour which has been present for some time, but seems surprising. You can reproduce with $ git init -q foo cd foo $ touch one git add one git commit -q -m one $ touch two git

GNU patch close to next stable release (2)

2012-08-01 Thread Andreas Grünbacher
After another improvement in git-style diff support to better handle concatenated diffs, here is a last call for testing to ensure that the code works well enough to become the next stable release. Please find the latest development snapshots here: ftp://alpha.gnu.org/gnu/patch/ The following

[PATCH] git-rebase.sh: fix typo

2012-08-01 Thread Ralf Thielow
Fix a typo in the error messages which is shown if it seems that a rebase is already in progress. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 0e6fd09..15da926 100755

[PATCH] git-am: make a config setting for --keep-non-patch switch

2012-08-01 Thread Paul Gortmaker
In order to make a commit be invariant (excluding ID) over a format-patch and subsequent am cycle, one needs to use the '--keep-non-patch' so that commits like: [PATCH] [i386] fix foo bar arch/x86/mm only lose the [PATCH] and not the [i386] part. Since it is a common desire (e.g. linux

Re: Broken git-svn tests known?

2012-08-01 Thread Ammon Riley
On Tue, Jul 31, 2012 at 11:51 PM, Frans Klaver franskla...@gmail.com wrote: On Wed, Aug 1, 2012 at 1:44 AM, Ammon Riley ammon.ri...@gmail.com wrote: On a freshly checked out copy of the maint branch (0e4c8822), the t9100-git-svn-basic.sh tests are failing 21 of 25 tests. Is this known, or am I

Re: Cherry-picking commits with empty messages

2012-08-01 Thread Junio C Hamano
Chris Webb ch...@arachsys.com writes: [summary: this, when 59a8fde does not have any commit log message, refuses to commit] $ git cherry-pick 59a8fde Aborting commit due to empty commit message. I can see that this check could make sense when the message has been modified, but it seems

Re: GNU patch close to next stable release (2)

2012-08-01 Thread Junio C Hamano
Andreas Grünbacher agr...@gnu.org writes: * Support for double-quoted filenames in the diff --git format: when a filename starts with a double quote, it is interpreted as a C string literal. The escape sequences \\, \, \a, \b, \f, \n, \r, \t, \v, and \ooo (a three-digit octal number

Re: Cherry-picking commits with empty messages

2012-08-01 Thread Angus Hammond
But from the bigger UI consistency point of view, it would be chaotic to change the default of some options for a single command depending on the nature of the operand, so I would recommend against going this route, and pick one view between give the user a chance to fix or the

[PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-01 Thread J Smith
Adds the grep.patternType configuration setting which sets the default pattern matching behavior. The values basic, extended, fixed, and perl can be used to set --basic-regexp, --extended-regexp, --fixed-strings, and --perl-regexp options by default respectively. A value of true is equivalent to

Re: [PATCH] git-am: make a config setting for --keep-non-patch switch

2012-08-01 Thread Junio C Hamano
Paul Gortmaker paul.gortma...@windriver.com writes: In order to make a commit be invariant (excluding ID) over a format-patch and subsequent am cycle, one needs to use the '--keep-non-patch' so that commits like: [PATCH] [i386] fix foo bar arch/x86/mm only lose the [PATCH] and not

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-01 Thread Jonathan Nieder
Hi again, Florian Achleitner wrote: When the first line arrives at the remote-helper, it starts importing one line at a time, leaving the remaining lines in the pipe. For importing it requires the data from fast-import, which would be mixed with import lines or queued at the end of

Re: [PATCH] git-am: make a config setting for --keep-non-patch switch

2012-08-01 Thread Paul Gortmaker
On 12-08-01 02:48 PM, Junio C Hamano wrote: Paul Gortmaker paul.gortma...@windriver.com writes: In order to make a commit be invariant (excluding ID) over a format-patch and subsequent am cycle, one needs to use the '--keep-non-patch' so that commits like: [PATCH] [i386] fix foo bar

Re: rename detection

2012-08-01 Thread Jeff King
On Tue, Jul 31, 2012 at 10:39:43AM +0200, Gerlando Falauto wrote: I have some questions about rename detection. The way I understand it, renames are not tracked in any way by GIT, at least not in the repository. Instead some detection algorithm is executed when data is extracted from the

Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Jeff King
On Wed, Aug 01, 2012 at 01:34:23PM +0700, Nguyen Thai Ngoc Duy wrote: On Wed, Aug 1, 2012 at 1:09 PM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: Yes. This is probably cosmetics only, but without path information, we leave it to chance to decide

[PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-01 Thread Robert Luberda
While importing changes from SVN by `git svn fetch' strip any white spaces from beginnings and endings of SVN commit messages and skip adding a new line character before `git-svn-id:' line in case the commit message ends with another pseudo-header (like From:, Signed-off-by: or Change-Id:, etc.).

[PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-01 Thread Robert Luberda
dcommit didn't handle errors returned by SVN and coped very poorly with concurrent commits that appear in SVN repository while dcommit was running. In both cases it left git repository in inconsistent state: index (which was reset with `git reset --mixed' after a successful commit to SVN) no

Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Jeff King
On Tue, Jul 31, 2012 at 11:01:27PM -0700, Junio C Hamano wrote: @@ -175,6 +177,11 @@ static int estimate_similarity(struct diff_filespec *src, if (max_size * (MAX_SCORE-minimum_score) delta_size * MAX_SCORE) return 0; + hashcpy(pair.one, src-sha1); +

Re: [PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-01 Thread Junio C Hamano
J Smith dark.pa...@gmail.com writes: As the basic structure and the direction looks good, let's start nitpicking ;-) Adds the grep.patternType configuration setting which sets the default pattern matching behavior. The values basic, extended, fixed, and perl can be used to set --basic-regexp,

Re: [PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-01 Thread Štěpán Němec
On Wed, 01 Aug 2012 14:55:52 -0700 Junio C. Hamano wrote: J Smith dark.pa...@gmail.com writes: grep.extendedRegexp:: -If set to true, enable '--extended-regexp' option by default. +If set to true, enable '--extended-regexp' option by default. This +option is ignored when the

Re: Cherry-picking commits with empty messages

2012-08-01 Thread Junio C Hamano
Angus Hammond angu...@gmail.com writes: But from the bigger UI consistency point of view, it would be chaotic to change the default of some options for a single command depending on the nature of the operand, so I would recommend against going this route, and pick one view between

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-01 Thread Robert Luberda
Eric Wong wrote: Hi, I've long wanted to change this, but it breaks compatibility if folks are importing from the same repo, sharing changes and one upgrades git-svn. Yes, I'm aware of this. That's why in our team at work everybody is forced to use the modified version of git-svn:) [ A bit

Please pull git-l10n updates for git v1.7.12-rc0

2012-08-01 Thread Jiang Xin
Hi Junio, The following changes since commit 9e2116adbe192f3090785bdf3412bf7e3e2767b7: Update draft release notes to 1.7.12 (2012-07-27 22:25:19 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to

Re: [PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-01 Thread J Smith
On Wed, Aug 1, 2012 at 5:55 PM, Junio C Hamano gits...@pobox.com wrote: As the basic structure and the direction looks good, let's start nitpicking ;-) Sounds good. We tend to write the commit log message in imperative mood, as if you are giving an order to the codebase to behave this way!.

Re: Please pull git-l10n updates for git v1.7.12-rc0

2012-08-01 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: The following changes since commit 9e2116adbe192f3090785bdf3412bf7e3e2767b7: Update draft release notes to 1.7.12 (2012-07-27 22:25:19 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-01 Thread Eric Wong
Robert Luberda rob...@debian.org wrote: Eric Wong wrote: How about making this optional and configurable at init/clone time? I don't think it will be hard to make it configurable. I can try to make such a change, do you have any preferences about the option and configuration key names? No

Re: [PATCH] git-rebase.sh: fix typo

2012-08-01 Thread Jiang Xin
2012/8/2 Ralf Thielow ralf.thie...@gmail.com: $(eval_gettext 'It seems that there is already a $state_dir_base directory, and -I wonder if you ware in the middle of another rebase. If that is the +I wonder if you are in the middle of another rebase. If that is the It's my fault in commit

Re: New git.pot is generated for the upcoming git v1.7.12

2012-08-01 Thread Jiang Xin
L10n teams, As Junio has already merged i18n topic branches and last round of l10n commits, New round of translation begins. This update of po/git.pot is not trival. You can fetch this update at the usual place and start translation: * https://github.com/git-l10n/git-po/commits/master Commit

Re: [WIP PATCH] Manual rename correction

2012-08-01 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Jul 31, 2012 at 11:01:27PM -0700, Junio C Hamano wrote: - As entries in rename cache that record high scores have names of similar blobs, pack-objects may be able to take advantage of this information. Yeah, although I suspect it is not as big