Re: [PATCH] builtin-commit.c: Not add duplicate S-o-b when commit

2012-07-26 Thread Jiang Xin
2012/7/26 Junio C Hamano : > After stating the observation like the above, please make it a habit > to say "which is bad because...", if you think it is a bad behaviour > and the patch is about fixing it. Indead before I start, I examine git-commit and git-am, and find the behaviours of the two co

[RFC 00/16] GSOC remote-svn, rewritten patch series

2012-07-26 Thread Florian Achleitner
Hi! I decided to completely rewrite my commit history, I split, dropped, squashed, and reordered. And finally rebased it all onto the current master. Hope this removed a lot of my personal confusion and makes the patches more useful and understandable. I think the remote helper does what it shou

[RFC 11/16] Add explanatory comment for transport-helpers refs mapping.

2012-07-26 Thread Florian Achleitner
transport-helpers can advertise the 'refspec' capability, if not a default refspec *:* is assumed. This explains the post-processing of refs after fetching with fast-import. Signed-off-by: Florian Achleitner --- transport-helper.c | 15 +++ 1 file changed, 15 insertions(+) diff --

Re: [RFC 01/16] Implement a remote helper for svn in C.

2012-07-26 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: > --- /dev/null > +++ b/contrib/svn-fe/remote-svn.c > @@ -0,0 +1,219 @@ > + > +#include "cache.h" > +#include "remote.h" > +#include "strbuf.h" > +#include "url.h" > +#include "exec_cmd.h" > +#include "run-command.h" > +#include "svndump.h" > +#include "argv-array.h"

Re: [RFC 01/16] Implement a remote helper for svn in C.

2012-07-26 Thread Florian Achleitner
On Thursday 26 July 2012 02:46:07 Jonathan Nieder wrote: > Hi, > > Florian Achleitner wrote: > > --- /dev/null > > +++ b/contrib/svn-fe/remote-svn.c > > @@ -0,0 +1,219 @@ > > + > > +#include "cache.h" > > +#include "remote.h" > > +#include "strbuf.h" > > +#include "url.h" > > +#include "exec_cmd.h

Re: [RFC 01/16] Implement a remote helper for svn in C.

2012-07-26 Thread Jonathan Nieder
Florian Achleitner wrote: > Yes, I incorporated your review in the new version, as far as applicable. But > I didn't send you an answer on the detailed points. > I will send an answer to the previous review .. Thanks. Now that I check, I see that you did make lots of important changes and prob

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

2012-07-26 Thread Florian Achleitner
Hi! Most of this review went into the new version.. For the remaining points, some comments follow. On Monday 02 July 2012 06:07:41 Jonathan Nieder wrote: > Hi, > > Florian Achleitner wrote: > > > --- /dev/null > > +++ b/contrib/svn-fe/remote-svn.c > > @@ -0,0 +1,207 @@ > > + > > +#include >

Re: [RFC 01/16] Implement a remote helper for svn in C.

2012-07-26 Thread Florian Achleitner
On Thursday 26 July 2012 03:14:43 Jonathan Nieder wrote: > Florian Achleitner wrote: > > Yes, I incorporated your review in the new version, as far as applicable. > > But I didn't send you an answer on the detailed points. > > I will send an answer to the previous review .. > > Thanks. Now that I

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

2012-07-26 Thread Jonathan Nieder
Florian Achleitner wrote: > Most of this review went into the new version.. > For the remaining points, some comments follow. Thanks for this. > On Monday 02 July 2012 06:07:41 Jonathan Nieder wrote: [...] >>> + >>> +static inline void printd(const char* fmt, ...) [...] >> Why not use trace_pr

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

2012-07-26 Thread Steven Michalske
On Jul 2, 2012, at 4:07 AM, Jonathan Nieder wrote: > [...] >> diff: Use fifo instead of pipe: Retrieve the name of the pipe from env and >> open it >> for svndump. > > I'd prefer to avoid this if possible, since it means having to decide > where the pipe goes on the filesystem. Can you summar

Question concerning merge behavior

2012-07-26 Thread Defcon0
Hello, I'm quite new to git and have the following situation: I have a master- and a productive-branch. The productive-branch lives on a server (productive environment) and the master is for the devs to play around ;-) Hot fixes and patches are primarily done in the productive branch. New feature

Re: [PATCH 3/3] difftool: Disable --symlinks on cygwin

2012-07-26 Thread Erik Faye-Lund
On Wed, Jul 25, 2012 at 5:14 AM, David Aguilar wrote: > Symlinks are not ubiquitous on Windows so make --no-symlinks the default. > > Signed-off-by: David Aguilar > --- > I don't have cygwin so I can't verify this one myself. > Is 'cygwin' really the value of $^O there? > > git-difftool.perl | 3

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

2012-07-26 Thread Jonathan Nieder
Steven Michalske wrote: > On Jul 2, 2012, at 4:07 AM, Jonathan Nieder wrote: >> [...] >>> diff: Use fifo instead of pipe: Retrieve the name of the pipe from env and >>> open it >>> for svndump. >> >> I'd prefer to avoid this if possible, since it means having to decide >> where the pipe goes on

Re: [PATCH v5 6/7] Remove dead code which contains bad gettext block

2012-07-26 Thread Nguyen Thai Ngoc Duy
On Wed, Jul 25, 2012 at 8:31 PM, Jiang Xin wrote: > 2012/7/25 Jonathan Nieder : >> Jiang Xin wrote: >> s/Junathan/Jonathan/, please, unless you are trying to say that both >> Junio and I pointed it out at the same time. > > Sorry. Correct it in next series of patches. > I don't know how this happe

Re: Question concerning merge behavior

2012-07-26 Thread Greg Troxel
I suggest that you read (all of) http://www.git-scm.com/book and then perhaps ask a question based on more understanding of the merge model and ancestry tracking. The short answer is that git will work quite well in terms of conflict management if your development practices are sane. pg

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Nguyen Thai Ngoc Duy
On Sat, Jul 21, 2012 at 12:09 AM, Jeff King wrote: > On Fri, Jul 20, 2012 at 06:37:02PM +0200, Johannes Sixt wrote: > >> Am 20.07.2012 17:44, schrieb Jeff King: >> > So I think a suffix like ":d" is probably the least horrible. >> >> Not so. It does not work on Windows :-( in the expected way. Try

[PATCH] i18n: leave \n out of translated diffstat

2012-07-26 Thread Nguyễn Thái Ngọc Duy
GETTEXT_POISON scrapes everything in translated strings, including \n. t4205.12 however needs this \n in matching the end result. Keep this \n out of translation to make t4205.12 happy. Signed-off-by: Nguyễn Thái Ngọc Duy --- I haven't followed recent i18n patches closely. Jiang may have alread

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 02:27:52PM +0800, Jiang Xin wrote: > Test "t/t7502-commit.sh" failed. I guess it's commit > v1.7.9.7-1-gf20f387 which breaks it. > > $ git log -1 --oneline --stat v1.7.9.7-1-gf20f387 > f20f commit: check committer identity more strictly > builtin/commit.c | 2

Re: False positive from orphaned_commit_warning() ?

2012-07-26 Thread Paul Gortmaker
On 12-07-25 05:52 PM, Junio C Hamano wrote: > Paul Gortmaker writes: > >> Has anyone else noticed false positives coming from the >> orphan check? > > Thanks. This should fix it. Indeed it does. Thanks for the fix (and git in general). Paul. -- > > builtin/checkout.c | 2 +- > 1 file chan

[PATCH 0/5] test-lib: filesystem prerequisites

2012-07-26 Thread Michael J Gruber
This mini series provides and makes use of test prerequisites for case insensitivity, symlinks and unicode conversion. SYMLINKS existed before but was not used in t0050. CASE_INSENSITIVE_FS was defined in t0003 rather than test-lib (and redone in t0050). UTF8_NFD_TO_NFC did not exist but was redon

[PATCH 1/5] test-lib: provide case insensitivity as a prerequisite

2012-07-26 Thread Michael J Gruber
Case insensitivity plays a role in several tests and is tested in several tests. Therefore, move the test from t003 into the test lib and use the prerequisite in t0003. Signed-off-by: Michael J Gruber --- t/README | 4 t/t0003-attributes.sh | 10 -- t/test-lib.sh

[PATCH 3/5] t0050: use the SYMLINKS test prereq

2012-07-26 Thread Michael J Gruber
Signed-off-by: Michael J Gruber --- t/t0050-filesystem.sh | 21 +++-- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index df9498b..b46ae72 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -8,7 +8,6 @@

[PATCH 5/5] t3910: use the SYMLINKS test prereq

2012-07-26 Thread Michael J Gruber
Besides reusing the new test prerequisite, this fixes also the issue that the current output is not TAP compliant and produces the output "no reason given" [for skipping]. Signed-off-by: Michael J Gruber --- t/t3910-mac-os-precompose.sh | 281 +-- 1 file c

[PATCH 4/5] test-lib: provide UTF8 behaviour as a prerequisite

2012-07-26 Thread Michael J Gruber
UTF8 behaviour of the filesystem (conversion from nfd to nfc) plays a role in several tests and is tested in several tests. Therefore, move the test from t0050 into the test lib and use the prerequisite in t0050. Signed-off-by: Michael J Gruber --- t/README | 5 + t/t0050-file

[PATCH 2/5] t0050: use the CASE_INSENSITIVE_FS test prereq

2012-07-26 Thread Michael J Gruber
Signed-off-by: Michael J Gruber --- t/t0050-filesystem.sh | 21 - 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 1542cf6..df9498b 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -7,23 +7,12

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

2012-07-26 Thread Florian Achleitner
On Thursday 26 July 2012 06:40:39 Jonathan Nieder wrote: > Steven Michalske wrote: > > On Jul 2, 2012, at 4:07 AM, Jonathan Nieder wrote: > >> [...] > >> > >>> diff: Use fifo instead of pipe: Retrieve the name of the pipe from env > >>> and open it for svndump. > >> > >> I'd prefer to avoid this

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

2012-07-26 Thread Jonathan Nieder
(cc-ing Ram since he's also knowledgeable about remote-helper protocol) Florian Achleitner wrote: > On Thursday 26 July 2012 06:40:39 Jonathan Nieder wrote: >> Though I still >> think the way forward is to keep using plain pipes internally for no

Re: [RFC 14/16] transport-helper: add import|export-marks to fast-import command line.

2012-07-26 Thread Florian Achleitner
I just found that for fast-export something similar was added to transport- helper in a515ebe9. By adding a capabilities advertised by the remote helper. Probably that would be a nicer way to do that. Btw, these added capabilities are not mentioned in Docs. On Thursday 26 July 2012 09:32:35 Flor

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

2012-07-26 Thread Florian Achleitner
On Thursday 26 July 2012 04:08:42 Jonathan Nieder wrote: > Florian Achleitner wrote: > > On Monday 02 July 2012 06:07:41 Jonathan Nieder wrote: > [...] > > >>> + > >>> +static inline void printd(const char* fmt, ...) > > [...] > > >> Why not use trace_printf and avoid the complication? > > > >

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Alexey Muranov
On 26 Jul 2012, at 14:47, Nguyen Thai Ngoc Duy wrote: > So we haven't found any way to present both branches "foo" and > "foo/bar" on file system at the same time. How about when we a new > branch introduces such a conflict, we push the new branch directly to > packed-refs? If we need either of th

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Junio C Hamano
Jeff King writes: > On Thu, Jul 26, 2012 at 02:27:52PM +0800, Jiang Xin wrote: > ... >> not ok - 21 committer is automatic >> # >> # >> # echo >>negative && >> # ( >> # sane_unset GIT_COMMITTER_EMAIL && >> # sane_unset GIT_CO

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Matthieu Moy
Alexey Muranov writes: > On 26 Jul 2012, at 14:47, Nguyen Thai Ngoc Duy wrote: > >> So we haven't found any way to present both branches "foo" and >> "foo/bar" on file system at the same time. How about when we a new >> branch introduces such a conflict, we push the new branch directly to >> pack

Re: [PATCH] builtin-commit.c: Not add duplicate S-o-b when commit

2012-07-26 Thread Junio C Hamano
Jiang Xin writes: > 2012/7/26 Junio C Hamano : >> After stating the observation like the above, please make it a habit >> to say "which is bad because...", if you think it is a bad behaviour >> and the patch is about fixing it. > > Indead before I start, I examine git-commit and git-am, and find

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 06:41:09PM +0200, Matthieu Moy wrote: > > How about simply deprecating "/" in branch name? > > Err, it's not like nobody's using this feature (Junio does a heavy use > of it in particular) ... Not to mention git itself, as it splits up the refs/remotes hierarchy into subd

Re: [PATCH v2 4/4] allow recovery from command name typos

2012-07-26 Thread Tay Ray Chuan
On Thu, Jul 26, 2012 at 1:57 AM, Junio C Hamano wrote: > > Tay Ray Chuan writes: > > > If suggestions are available (based on Levenshtein distance) and if the > > terminal isatty(), present a prompt to the user to select one of the > > computed suggestions. > > The way to determine "If the termin

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 09:34:27AM -0700, Junio C Hamano wrote: > >> not ok - 21 committer is automatic > [...] > > I am not sure that the test is really all that useful. The point seems > > to be that we fall back to some kind of system-based ident, but that is > > not portable. > > I think the

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Alexey Muranov
On 26 Jul 2012, at 18:59, Jeff King wrote: > Not to mention git itself, as it splits up the refs/remotes hierarchy > into subdirectories. I think deprecating "/" is out of the question. > > -Peff Ok, i guess you know better than me, my vision of Git is probably still too simplistic. -Alexey.--

Re: [PATCH v2 4/4] allow recovery from command name typos

2012-07-26 Thread Jeff King
On Fri, Jul 27, 2012 at 01:08:34AM +0800, Tay Ray Chuan wrote: > > Perhaps we should audit "isatty()" calls and replace them with a > > helper function that does this kind of thing consistently in a more > > robust way (my recent favorite is Linus's somewhat anal logic used > > in builtin/merge.c:

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

2012-07-26 Thread Junio C Hamano
Jonathan Nieder writes: > [...] + +enum cmd_result { SUCCESS, NOT_HANDLED, ERROR }; > [...] >> Hm.. the enum now has SUCCESS, NOT_HANDLED, TERMINATE. > > Much nicer. > > I think this tristate return value could be avoided entirely because... > ... it isn't needed at the moment. I am no

Re: [PATCH 3/3] difftool: Disable --symlinks on cygwin

2012-07-26 Thread David Aguilar
On Thu, Jul 26, 2012 at 4:31 AM, Erik Faye-Lund wrote: > On Wed, Jul 25, 2012 at 5:14 AM, David Aguilar wrote: >> Symlinks are not ubiquitous on Windows so make --no-symlinks the default. >> >> Signed-off-by: David Aguilar >> --- >> I don't have cygwin so I can't verify this one myself. >> Is 'c

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Junio C Hamano
Jeff King writes: > On Fri, Jul 20, 2012 at 06:37:02PM +0200, Johannes Sixt wrote: > >> Am 20.07.2012 17:44, schrieb Jeff King: >> > So I think a suffix like ":d" is probably the least horrible. >> >> Not so. It does not work on Windows :-( in the expected way. Trying to >> open a file with a co

Re: [PATCH] i18n: leave \n out of translated diffstat

2012-07-26 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/diff.c b/diff.c > index 62cbe14..95706a5 100644 > --- a/diff.c > +++ b/diff.c > @@ -1397,7 +1397,7 @@ int print_stat_summary(FILE *fp, int files, int > insertions, int deletions) > > if (!files) { > assert(insertions == 0 && dele

Re: [PATCH 1/3] retain reflogs for deleted refs

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 10:46:01AM -0700, Junio C Hamano wrote: > > Bleh. It seems that we did too good a job in coming up with a list of > > disallowed ref characters; they really are things you don't want in your > > filenames at all. :) > > Why do no need to even worry about ~ vs : vs whatever

Re: [PATCH v2 4/4] allow recovery from command name typos

2012-07-26 Thread Junio C Hamano
Tay Ray Chuan writes: > On Thu, Jul 26, 2012 at 1:57 AM, Junio C Hamano wrote: >> >> Tay Ray Chuan writes: >> >> > If suggestions are available (based on Levenshtein distance) and if the >> > terminal isatty(), present a prompt to the user to select one of the >> > computed suggestions. >> >> T

Re: [PATCH v2 4/4] allow recovery from command name typos

2012-07-26 Thread Junio C Hamano
Jeff King writes: > - isatty(0) check in cmd_revert to set opts.edit automatically. This > one should match merge's behavior. > ... > So I think the only one that could be improved is the one in cmd_revert. Yeah, that matches the result of my grep. Thanks for sanity checking. > The crede

Re: [PATCH 0/5] test-lib: filesystem prerequisites

2012-07-26 Thread Junio C Hamano
Michael J Gruber writes: > This mini series provides and makes use of test prerequisites for > case insensitivity, symlinks and unicode conversion. > > SYMLINKS existed before but was not used in t0050. > CASE_INSENSITIVE_FS was defined in t0003 rather than test-lib (and redone in > t0050). > UTF

Re: [PATCH v2 4/4] allow recovery from command name typos

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 10:59:51AM -0700, Junio C Hamano wrote: > > The credential code uses git_terminal_prompt, which actually opens > > /dev/tty directly. So it is probably sane to use for your new prompt, > > but it does not (and should not) rely on isatty. > > I think using git_terminal_prom

Re: [PATCH 0/5] test-lib: filesystem prerequisites

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 11:16:45AM -0700, Junio C Hamano wrote: > Consolidating the logic to set necessary prerequisites used in > various scripts is very good, but I am not sure adding them to > test-lib and run them unconditionally is a good idea. SYMLINKS is > used by 47 among 595 tests, which

Re: [PATCH 3/3] difftool: Disable --symlinks on cygwin

2012-07-26 Thread Junio C Hamano
David Aguilar writes: > On Thu, Jul 26, 2012 at 4:31 AM, Erik Faye-Lund wrote: >> On Wed, Jul 25, 2012 at 5:14 AM, David Aguilar wrote: >>> Symlinks are not ubiquitous on Windows so make --no-symlinks the default. >>> >>> Signed-off-by: David Aguilar >>> --- >>> I don't have cygwin so I can't

Re: [PATCH 2/2] difftool: Handle compare() returning -1

2012-07-26 Thread Junio C Hamano
David Aguilar writes: > +sub exit_cleanup > +{ > + my ($tmpdir, $status) = @_; > + rmtree($tmpdir); > + if ($status and $!) { > + my ($package, $file, $line) = caller(); > + warn "$file line $line: $!\n"; Are you sure rmtree() would not clobber $! before the c

Re: [PATCH 2/2] difftool: Handle compare() returning -1

2012-07-26 Thread David Aguilar
On Thu, Jul 26, 2012 at 12:07 PM, Junio C Hamano wrote: > David Aguilar writes: > >> +sub exit_cleanup >> +{ >> + my ($tmpdir, $status) = @_; >> + rmtree($tmpdir); >> + if ($status and $!) { >> + my ($package, $file, $line) = caller(); >> + warn "$file line $li

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Junio C Hamano
Jeff King writes: > Right. You can check this only when "git var GIT_COMMITTER_IDENT" works, > and you can check the f20f387 behavior only when it does _not_ work. So > we could do something like: > > (sane_unset GIT_COMMITTER_NAME && >sane_unset GIT_COMMITTER_EMAIL && >git var GIT_COMM

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 12:25:16PM -0700, Junio C Hamano wrote: > There are three cases with respect to ident: > > - There is a user-configured one; > > - We derive one from the system and that is syntactically correct, >but we know from the past experience the system is often >misconf

[PATCH v2 2/2] difftool: Handle compare() returning -1

2012-07-26 Thread David Aguilar
Keep the temporary directory around when compare() cannot read its input files, which is indicated by -1. Defer tempdir creation to allow an early exit in setup_dir_diff(). Wrap the rest of the entry points in an exit_cleanup() function to handle removing temporary files and error reporting. Prin

[PATCH v2 1/2] difftool: Wrap long lines for readability

2012-07-26 Thread David Aguilar
Keep everything within 80 columns. Wrap the user-facing messages too. Signed-off-by: David Aguilar --- Unchanged since last time -- resending for patch 2/2 git-difftool.perl | 46 -- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/git

Re: Test "t/t7502-commit.sh" failed

2012-07-26 Thread Junio C Hamano
Jeff King writes: > Yes, and they are given that chance. This is not about the behavior of > git, but about stupid assumptions by the test. OK. > I'm close to finished with a series that I think will at least make it > better. Stay tuned. ;-) -- To unsubscribe from this list: send the line "u

Re: [PATCH 0/5] test-lib: filesystem prerequisites

2012-07-26 Thread Junio C Hamano
Jeff King writes: > That looks like a maintenance annoyance. Can't we just have the > prerequisite-checker lazily perform the test on demand and cache the > result? It should be OK as long as: > > 1. The prereq is careful about its pre- and post- conditions. We > already make sure to clea

[PATCH 0/6] t7502 fixes

2012-07-26 Thread Jeff King
On Thu, Jul 26, 2012 at 03:33:59PM -0400, Jeff King wrote: > I'm close to finished with a series that I think will at least make it > better. Stay tuned. Here it is. I was able to replicate the original problem by munging my /etc/passwd, and I've confirmed that this series fixes it by skipping th

[PATCH 1/6] t7502: clean up fake_editor tests

2012-07-26 Thread Jeff King
Using write_script saves us a few lines of code, and means we consistently use $SHELL_PATH. We can also drop the setting of the $pwd variable from $(pwd). In the first instance, there is no reason to use it (we can just use $(pwd) directly two lines later, since we are interpolating the here-docum

[PATCH 2/6] t7502: properly quote GIT_EDITOR

2012-07-26 Thread Jeff King
One of the tests tries to ensure that editor is not run due to an early failure. However, it needs to quote the pathname of the trash directory used in $GIT_EDITOR, since git will pass it along to the shell. In other words, the test would pass whether the code was correct or not, since the unquoted

[PATCH 3/6] t7502: narrow checks for author/committer name in template

2012-07-26 Thread Jeff King
t7502.20 and t7502.21 check that the author and committer name are mentioned in the commit message template under certain circumstances. However, they end up checking a much larger and unnecessary portion of the template. Let's narrow their checks to the specific lines. While we're at it, let's gi

[PATCH 4/6] t7502: drop confusing test_might_fail call

2012-07-26 Thread Jeff King
In t7502.20, we run "git commit" and check that it warns us that the author and committer identity are not the same (this is always the case in the test environment, since we set up the idents differently). Instead of actually making a commit, we have a clean index, so the "git commit" we run will

[PATCH 5/6] t7502: handle systems where auto-identity is broken

2012-07-26 Thread Jeff King
Test t7502.21 checks whether we write the committer name into COMMIT_EDITMSG when it has been automatically determined. However, not all systems can produce valid automatic identities. Prior to f20f387 (commit: check committer identity more strictly), this test worked even when we did not have a v

[PATCH 6/6] t7502: test early quit from commit with bad ident

2012-07-26 Thread Jeff King
In commit f20f387, "git commit" notices and dies much earlier when we have a bogus commit identity. That commit did not add a test because we cannot do so reliably (namely, we can only trigger the behavior on a system where the automatically generated identity is bogus). However, now that we have a

Re: [PATCH v9] git on Mac OS and precomposed unicode

2012-07-26 Thread Robin Rosenberg
Just a couple of nitpicks. Torsten Bögershausen skrev 2012-07-08 15.50: diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c [...] +static size_t has_utf8(const char *s, size_t maxlen, size_t *strlen_c) +{ + const uint8_t *utf8p = (const uint8_t*) s; + size_t strlen_cha

Re: [PATCH 0/6] t7502 fixes

2012-07-26 Thread Junio C Hamano
All patches look very sensible. 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

The GitTogether

2012-07-26 Thread Scott Chacon
For the last few years, there has been a gathering of Gitty people in Mountain View directly following the GSoC Mentor Summit that is referred to as a GitTogether: https://git.wiki.kernel.org/index.php/GitTogether A few of us have been talking about what we would like to do this year and thinking

Re: [PATCH v9] git on Mac OS and precomposed unicode

2012-07-26 Thread Junio C Hamano
Robin Rosenberg writes: > Just a couple of nitpicks. Polishing is always good and better late than never, but for a topic that has long been graduated to 'master' already, it would be easier to review and discuss if it came as a patch form relative to the codebase _after_ the topic has been appl

[PATCH 1/2] test: rename $satisfied to $satisfied_prereq

2012-07-26 Thread Junio C Hamano
All other shell variables that globally keep track of prerequisite related states have "prereq" somewhere in their names. Be consistent and avoid name crashes. Signed-off-by: Junio C Hamano --- * Just a preparatory clean-up. t/test-lib-functions.sh | 6 +++--- 1 file changed, 3 insertions(+),

[RFC/PATCH 2/2] test: allow prerequisite to be evaluated lazily

2012-07-26 Thread Junio C Hamano
The test prerequisite mechanism is a useful way to allow some tests in a test script to be skipped in environments that do not offer certain features (e.g. checking how symbolic links are handled on filesystems that do not support them). It is OK for commonly used prerequisites to be always tested

[PATCH 3/2] test-lib: provide case insensitivity as a prerequisite

2012-07-26 Thread Junio C Hamano
And on top, Michael's [1/5] would become like this, and [2/5] would apply unchanged. -- >8 -- From: Michael J Gruber Date: Thu, 26 Jul 2012 15:39:53 +0200 Case insensitivity plays a role in several tests and is tested in several tests. Therefore, move the test from t003 into the test lib and use

Extract Git::SVN from git-svn, take 2.

2012-07-26 Thread Michael G. Schwern
Same as before, now with tab indentation in the new Perl tests. As before, patch #3 is 132k and will be rejected by some of the lists. -- 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

[PATCH 1/4] Extract some utilities from git-svn to allow extracting Git::SVN.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Put them in a new module called Git::SVN::Utils. Yeah, not terribly original and it will be a dumping ground. But its better than having them in the main git-svn program. At least they can be documented and tested. * fatal() is used by many classes. * Change the $ca

[PATCH 2/4] Prepare Git::SVN for extraction into its own file.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" This means it should be able to load without git-svn being loaded. * Load Git.pm on its own and all the needed command functions. * It needs to grab at a git-svn lexical $_prefix representing the --prefix option. Provide opt_prefix() for that. This is a refactorin

[PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Also it can compile on its own now, yay! --- git-svn.perl | 4 perl/Git/SVN.pm | 9 +++-- t/Git-SVN/00compile.t | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 4c77f69..ef10f6f 100755 ---

[PATCH 4/2] test-lib: provide UTF8 behaviour as a prerequisite

2012-07-26 Thread Junio C Hamano
And Michael's [4/5] would become like this (again, [3/5] does not need any change). -- >8 -- From: Michael J Gruber Date: Thu, 26 Jul 2012 15:39:56 +0200 UTF8 behaviour of the filesystem (conversion from nfd to nfc) plays a role in several tests and is tested in several tests. Therefore, move

Extract remaining classes from git-svn

2012-07-26 Thread Michael G. Schwern
This series of patches extracts the remaining classes from git-svn. They're all simple extractions and functionally have no change. -- 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.or

[PATCH 1/8] Prepare Git::SVN::Log for extraction from git-svn.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" * Load Git command functions itself. * Can't access the git-svn switch lexical any more, but its only used by Git::SVN::Log so turn it into a Git::SVN::Log global. * Load Git::SVN as needed. No need to load it always, its only used twice. * Moved a state variable

[PATCH 2/8] Extract Git::SVN::Log from git-svn.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Straight cut & paste. Also noticed Git::SVN::Ra wasn't in the compile test. It is now. --- git-svn.perl | 395 +- perl/Git/SVN/Log.pm | 395 ++ perl/Makefile

[PATCH 3/8] Prepare Git::SVN::Migration for extraction from git-svn.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" * Load Git command functions on its own. * Load Git::SVN modules on its own. Drive by refactorings... * Use our() instead of use vars. * Eliminate the auto loading of Git functions. --- git-svn.perl | 36 1 file changed, 24 inserti

[PATCH 8/8] Fix indents to match style.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" --- git-svn.perl | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 584e93a..4d173d4 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -31,14 +31,14 @@ use Git::SVN::Migration; use Git::SVN::Utils qw(

[PATCH 7/8] Extract Git::SVN::GlobSpec from git-svn.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Straight cut & paste. That's the last class. * Make Git::SVN load it on its own, its the only thing that needs it. --- git-svn.perl | 59 perl/Git/SVN.pm | 2 ++ perl/Git/SVN/GlobSpec.pm | 59

[PATCH 6/8] Move Git::IndexInfo into its own file.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Straight cut & paste. Didn't require any fixing. --- git-svn.perl| 32 perl/Git/IndexInfo.pm | 33 + perl/Git/SVN/Fetcher.pm | 1 + perl/Makefile | 1 + t/Git-SVN/00compile.t

[PATCH 4/8] Extract Git::SVN::Migration from git-svn.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Straight cut & paste. --- git-svn.perl | 258 +- perl/Git/SVN/Migration.pm | 258 ++ perl/Makefile | 1 + t/Git-SVN/00compile.t | 3 +- 4 files chan

[PATCH 5/8] Load all the modules in one place and before running code.

2012-07-26 Thread Michael G. Schwern
From: "Michael G. Schwern" Just makes the code easier to follow. No functional change. Also eliminate an unused lexical $SVN. --- git-svn.perl | 44 +--- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 37

Re: Extract remaining classes from git-svn

2012-07-26 Thread Michael G Schwern
On 2012.7.26 5:25 PM, Michael G. Schwern wrote: > This series of patches extracts the remaining classes from git-svn. They're > all simple extractions and functionally have no change. PS This is on top of the previous Git::SVN extraction patch series. -- 100. Claymore mines are not filled wit

Re: [PATCH] builtin-commit.c: Not add duplicate S-o-b when commit

2012-07-26 Thread Jiang Xin
2012/7/27 Junio C Hamano : >> Signed-off-by: A >> Signed-off-by: B >> Reported-by: C >> >> So I guess duplicate S-o-b is not intentional. > > I think the two commands are doing randomly different things on > garbage input. The order in the input (i.e. your "original") does > not make s

Re: [PATCH 2/4] Prepare Git::SVN for extraction into its own file.

2012-07-26 Thread Junio C Hamano
"Michael G. Schwern" writes: > From: "Michael G. Schwern" > > This means it should be able to load without git-svn being loaded. > > * Load Git.pm on its own and all the needed command functions. > > * It needs to grab at a git-svn lexical $_prefix representing the --prefix > option. Provide

Re: [PATCH 1/4] Extract some utilities from git-svn to allow extracting Git::SVN.

2012-07-26 Thread Junio C Hamano
"Michael G. Schwern" writes: > From: "Michael G. Schwern" > > Put them in a new module called Git::SVN::Utils. Yeah, not terribly > original and it will be a dumping ground. But its better than having > them in the main git-svn program. At least they can be documented > and tested. > > * fata

Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Junio C Hamano
"Michael G. Schwern" writes: > From: "Michael G. Schwern" > > Also it can compile on its own now, yay! Hmmm. If you swap the order of steps 3/4 and 4/4 by creating Git/SVN.pm that only has these variable definitions (i.e. "our $X" and "use vars $X") and make git-svn.perl use them from Git::SVN

Re: [PATCH 2/4] Prepare Git::SVN for extraction into its own file.

2012-07-26 Thread Junio C Hamano
Junio C Hamano writes: > "Michael G. Schwern" writes: > >> From: "Michael G. Schwern" >> >> This means it should be able to load without git-svn being loaded. >> >> * Load Git.pm on its own and all the needed command functions. >> >> * It needs to grab at a git-svn lexical $_prefix representing

Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Jonathan Nieder
Junio C Hamano wrote: > "Michael G. Schwern" writes: >> Also it can compile on its own now, yay! > > Hmmm. I agree with Michael's "yay" and also think it's fine that after patch 3 it isn't there yet. That's because git-svn.perl doesn't use Git::SVN on its own but helps it out a little. So even

Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Junio C Hamano
Jonathan Nieder writes: >> In short: >> >> - I didn't see anything questionable in 1/4; >> >> - Calling up ::opt_prefix() from module in 2/4 looked ugly to me >>but I suspect it should be easy to fix; >> >> - 3/4 was a straight move and I didn't see anything questionable in >>it, but I

What's cooking in git.git (Jul 2012, #08; Thu, 26)

2012-07-26 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'. Please consider that the tip of 'master' is more or less feature complete. Topics that are not in 'next' by the time I tag -rc1 sometime early

Re: The GitTogether

2012-07-26 Thread Heiko Voigt
Hi Scott, On Thu, Jul 26, 2012 at 03:28:00PM -0700, Scott Chacon wrote: > For those of you who *have* been to a GitTogether, what did you find > useful and/or useless about it? What did you get out of it and would > like to see again? For those of you who have never been, what do you > think wou

Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.

2012-07-26 Thread Junio C Hamano
Junio C Hamano writes: > t91XX series seem to fail in 'pu' with "Can't locate Git/SVN.pm in > @INC" for me. I see perl/blib/lib/Git/SVN/ directory and files > under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see > Git/I18N.pm and Git/SVN/Ra.pm (and friends) mentioned in > perl/pe