[PATCH v2 00/14] Remove unused code from imap-send.c

2013-01-15 Thread Michael Haggerty
This is a re-roll, incorporating the feedback of Jonathan Nieder (thanks!). Differences from v1: * Added comments to get_cmd_result() at the place where the NAMESPACE response is skipped over. * Added some comments to lf_to_crlf(), simplified the code a bit further, and expanded the commit

[PATCH v2 03/14] iamp-send.c: remove unused struct imap_store_conf

2013-01-15 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 5 - 1 file changed, 5 deletions(-) diff --git a/imap-send.c b/imap-send.c index 29c10a4..dbe0546 100644 --- a/imap-send.c +++ b/imap-send.c @@ -130,11 +130,6 @@ static struct imap_server_conf server = { NULL,

[PATCH v2 05/14] imap-send.c: remove struct message

2013-01-15 Thread Michael Haggerty
It was never used. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 26 -- 1 file changed, 26 deletions(-) diff --git a/imap-send.c b/imap-send.c index b8a7ff9..9e181e0 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,23 +33,10 @@ typedef void

[PATCH v2 08/14] imap-send.c: remove struct imap argument to parse_imap_list_l()

2013-01-15 Thread Michael Haggerty
It was always set to NULL. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 39 +++ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/imap-send.c b/imap-send.c index cbbf845..29e4037 100644 --- a/imap-send.c +++ b/imap-send.c

[PATCH v2 09/14] imap-send.c: remove namespace fields from struct imap

2013-01-15 Thread Michael Haggerty
They are unused, and their removal means that a bunch of list-related infrastructure can be disposed of. It might be that the NAMESPACE response that is now skipped over in get_cmd_result() should never be sent by the server. But somebody would have to check the IMAP protocol and how we interact

[PATCH v2 10/14] imap-send.c: remove unused field imap_store::trashnc

2013-01-15 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/imap-send.c b/imap-send.c index ff44013..909e4db 100644 --- a/imap-send.c +++ b/imap-send.c @@ -127,7 +127,6 @@ struct imap_store { int uidvalidity; struct

[PATCH v2 13/14] imap-send.c: fold struct store into struct imap_store

2013-01-15 Thread Michael Haggerty
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index a0f42bb..f2933e9 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,12 +33,6 @@ typedef void *SSL; #include

[PATCH v2 12/14] imap-send.c: remove unused field imap_store::uidvalidity

2013-01-15 Thread Michael Haggerty
I suspect that the existence of both imap_store::uidvalidity and store::uidvalidity was an accident. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 1 - 1 file changed, 1 deletion(-) diff --git a/imap-send.c b/imap-send.c index 48c646c..a0f42bb 100644 --- a/imap-send.c

[PATCH v2 04/14] imap-send.c: remove struct store_conf

2013-01-15 Thread Michael Haggerty
It was never used. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 11 --- 1 file changed, 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index dbe0546..b8a7ff9 100644 --- a/imap-send.c +++ b/imap-send.c @@ -33,15 +33,6 @@ typedef void *SSL; #include

Re: [PATCH v2] Make git selectively and conditionally ignore certain stat fields

2013-01-15 Thread Junio C Hamano
Robin Rosenberg robin.rosenb...@dewire.com writes: I'd say a simplistic ignore if zero is stored or even ignore this as one of the systems that shares this file writes crap in it may be sufficient, and if this is a jGit specific issue, it might even make sense to introduce a single

[PATCH v2 01/14] imap-send.c: remove msg_data::flags, which was always zero

2013-01-15 Thread Michael Haggerty
This removes the need for function imap_make_flags(), so delete it, too. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 40 +++- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/imap-send.c b/imap-send.c index

[PATCH v2 07/14] imap-send.c: inline imap_parse_list() in imap_list()

2013-01-15 Thread Michael Haggerty
The function is only called from here. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/imap-send.c b/imap-send.c index f193211..cbbf845 100644 --- a/imap-send.c +++ b/imap-send.c @@ -669,21 +669,16

[PATCH v2 02/14] imap-send.c: remove struct msg_data

2013-01-15 Thread Michael Haggerty
Now that its flags member has been deleted, all that is left is a strbuf. So use a strbuf directly. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/imap-send.c b/imap-send.c index

[PATCH v2 11/14] imap-send.c: use struct imap_store instead of struct store

2013-01-15 Thread Michael Haggerty
In fact, all struct store instances are upcasts of struct imap_store anyway, so stop making the distinction. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/imap-send.c b/imap-send.c

[PATCH v2 14/14] imap-send.c: simplify logic in lf_to_crlf()

2013-01-15 Thread Michael Haggerty
* The first character in the string used to be special-cased to get around the fact that msg-buf[i - 1] is not defined for i == 0. Instead, keep track of the previous character in a separate variable, lastc, initialized in such a way to let the loop handle i == 0 correctly. * Make the two

most proper presents thomas sabo charm bracelet

2013-01-15 Thread kovaxiyazi
No matter whether Christmas or Evening of romance or any other wedding that you would need to celebrate, thomas sabo uk reward may be just appropriate for just a celebration. Some individuals see an exceptional demonstrates to uncover for themselves. That one could purchase unique occasion at the

That Explains Why Everybody Is Preaching About thomas sabo

2013-01-15 Thread jinjcb21
When i received these jewelry (combined with matching necklace around your neck) for Christmas. This graphic would not carry out them rights. The product quality can be great and perhaps they are seriously attractive! thomas sabo bracelet http://www.thomassaboukjewellery.co.uk/ have a seriously

The Very Best Stratagems For thomas sabo

2013-01-15 Thread jinjcb21
I adore thomas sabo jewellery http://www.thomassaboonlineau.com/ necklace around your neck, the only dilemma which i possess is always that getting older reside instantly seeing that proven around the graphic mainly because there are actually simply no hooks to keep this this way. This

Re: [BUG] Possible bug in `remote set-url --add --push`

2013-01-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 15.01.2013 07:39: Junio C Hamano gits...@pobox.com writes: Jardel Weyrich jweyr...@gmail.com writes: If you allow me, I'd like you to forget about the concepts for a minute, and focus on the user experience. Imagine a simple hypothetical scenario in

Re: [PATCH] remote-hg: store converted URL

2013-01-15 Thread Max Horn
On 14.01.2013, at 19:14, Junio C Hamano wrote: Max Horn m...@quendi.de writes: From: Felipe Contreras felipe.contre...@gmail.com Mercurial might convert the URL to something more appropriate, like an absolute path. What it is converted *TO* is fairly clear with , like an ..., but

[PATCH] test-lib.sh: unfilter GIT_PERF_*

2013-01-15 Thread Nguyễn Thái Ngọc Duy
These variables are user parameters to control how to run the perf tests. Allow users to do so. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/test-lib.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index f50f834..b8d35d1 100644 ---

[PATCH] remote-hg: fix handling of file perms when pushing

2013-01-15 Thread Max Horn
Previously, when changing and committing an executable file, the file would loose its executable bit on the hg side. Likewise, symlinks ended up as normal files. This was not immediately apparent on the git side unless one did a fresh clone. --- contrib/remote-helpers/git-remote-hg | 2 +-

Re: [PATCH] remote-hg: fix handling of file perms when pushing

2013-01-15 Thread Max Horn
On 15.01.2013, at 14:02, Max Horn wrote: Previously, when changing and committing an executable file, the file would loose its executable bit on the hg side. Likewise, symlinks ended up as normal files. This was not immediately apparent on the git side unless one did a fresh clone. Sorry,

[PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Nguyễn Thái Ngọc Duy
94bc671 (Add directory pattern matching to attributes - 2012-12-08) uses find_basename() to calculate the length of directory part in prepare_attr_stack. This function expects the directory without the trailing slash (as origin field in match_attr struct is without the trailing slash).

Re: [PATCH] test-lib.sh: unfilter GIT_PERF_*

2013-01-15 Thread Thomas Rast
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These variables are user parameters to control how to run the perf tests. Allow users to do so. [...] @@ -86,6 +86,9 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $($PERL_PATH -e ' PROVE VALGRIND

Re: [PATCH] test-lib.sh: unfilter GIT_PERF_*

2013-01-15 Thread Duy Nguyen
On Tue, Jan 15, 2013 at 8:43 PM, Thomas Rast tr...@student.ethz.ch wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These variables are user parameters to control how to run the perf tests. Allow users to do so. [...] @@ -86,6 +86,9 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $($PERL_PATH -e

[PATCH v2] test-lib.sh: unfilter GIT_PERF_*

2013-01-15 Thread Nguyễn Thái Ngọc Duy
These variables are user parameters to control how to run the perf tests. Allow users to do so. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index f50f834..e1c8c85 100644

Re: [PATCH v2 00/14] Remove unused code from imap-send.c

2013-01-15 Thread Jeff King
On Tue, Jan 15, 2013 at 09:06:18AM +0100, Michael Haggerty wrote: This is a re-roll, incorporating the feedback of Jonathan Nieder (thanks!). Thanks, I don't see anything wrong with this from a cursory reading. * Added some comments to lf_to_crlf(), simplified the code a bit further, and

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

2013-01-15 Thread Jeff King
On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: It appears that memcmp() uses the usual one word at a time comparison and triggers valgrind in a callback of bsearch() used in the refname search. I can easily trigger problems in any script with test_commit (e.g. sh

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

2013-01-15 Thread René Scharfe
Am 15.01.2013 00:36, schrieb Junio C Hamano: It appears that memcmp() uses the usual one word at a time comparison and triggers valgrind in a callback of bsearch() used in the refname search. I can easily trigger problems in any script with test_commit (e.g. sh t0101-at-syntax.sh --valgrind

Re: [PATCH] am: invoke perl's strftime in C locale

2013-01-15 Thread Jeff King
On Tue, Jan 15, 2013 at 12:59:33AM +0400, Dmitry V. Levin wrote: diff --git a/git-am.sh b/git-am.sh index c682d34..64b88e4 100755 --- a/git-am.sh +++ b/git-am.sh @@ -334,7 +334,7 @@ split_patches () { # Since we cannot guarantee that the commit message is in

Re: [PATCH 1/6] config: add helper function for parsing key names

2013-01-15 Thread Jeff King
On Mon, Jan 14, 2013 at 10:08:47AM -0800, Junio C Hamano wrote: +extern int match_config_key(const char *var, +const char *section, +const char **subsection, int *subsection_len, +const char **key); + I agree with Jonathan about the

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Junio C Hamano
Good spotting and a nicely explained patch. 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

Re: [PATCH] am: invoke perl's strftime in C locale

2013-01-15 Thread Antoine Pelisse
This puts all of perl into the C locale, which would mean error messages from perl would be in English rather than the user's language. It probably isn't a big deal, because that snippet of perl is short and not likely to produce problems, but I wonder how hard it would be to set the locale

Re: [PATCH] remote-hg: store converted URL

2013-01-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Max Horn m...@quendi.de writes: ... See also the discussion (yeah, this time a real one ;-) leading to this: https://github.com/felipec/git/issues/2 ... If I understand correctly, the $backend::$opaqueToken is a contract between the remote-helper

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

2013-01-15 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: It appears that memcmp() uses the usual one word at a time comparison and triggers valgrind in a callback of bsearch() used in the refname search. I can easily trigger problems in any script

Re: [PATCH v2 2/3] config: Introduce diff.algorithm variable

2013-01-15 Thread Jeff King
On Mon, Jan 14, 2013 at 01:05:27PM -0800, Junio C Hamano wrote: Michal Privoznik mpriv...@redhat.com writes: +static long parse_algorithm_value(const char *value) +{ + if (!value || !strcasecmp(value, myers)) + return 0; [diff] algorithm should probably error

Re: [PATCH 1/6] config: add helper function for parsing key names

2013-01-15 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... did you have any comment on the struct config_key alternative I sent as a follow-up? I did read it but I cannot say I did so very carefully. My gut reaction was that the take the variable name and section name, return the subsection name pointer and length,

Re: [PATCH v2 2/3] config: Introduce diff.algorithm variable

2013-01-15 Thread Junio C Hamano
Jeff King p...@peff.net writes: Also it is rather unusual to parse the keyword values case insensitively. Is it? git grep strcasecmp shows that we already do so in many cases (e.g., any bool option, core.autocrlf, receive.deny*, etc). Yeah, I did the same grep after I wrote the message.

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

2013-01-15 Thread Jeff King
On Tue, Jan 15, 2013 at 08:55:32AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: It appears that memcmp() uses the usual one word at a time comparison and triggers valgrind in a callback of bsearch() used in

Re: [PATCH] am: invoke perl's strftime in C locale

2013-01-15 Thread Dmitry V. Levin
On Tue, Jan 15, 2013 at 08:50:59AM -0800, Jeff King wrote: On Tue, Jan 15, 2013 at 05:42:12PM +0100, Antoine Pelisse wrote: This puts all of perl into the C locale, which would mean error messages from perl would be in English rather than the user's language. It probably isn't a big

Re: [PATCH] remote-hg: store converted URL

2013-01-15 Thread Max Horn
On 15.01.2013, at 17:05, Junio C Hamano wrote: Max Horn m...@quendi.de writes: On 14.01.2013, at 19:14, Junio C Hamano wrote: What is lacking from this description is why it even needs to work from a different working directory In your rewrite below, this is still lacking, I

Re: [PATCH] remote-hg: store converted URL

2013-01-15 Thread Max Horn
On 15.01.2013, at 17:51, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Max Horn m...@quendi.de writes: ... See also the discussion (yeah, this time a real one ;-) leading to this: https://github.com/felipec/git/issues/2 ... If I understand correctly, the

Re: [PATCH v2 06/19] reset.c: remove unnecessary variable 'i'

2013-01-15 Thread Martin von Zweigbergk
I suppose this was meant for everyone. Adding back the others. On Tue, Jan 15, 2013 at 10:27 AM, Holding, Lawrence (NZ) lawrence.hold...@cubic.com wrote: Maybe use *argv instead of argv[0]? Sure. Everywhere? Also in the lines added in patch 17/19 that refer to both argv[0] and argv[1], such as

[PATCH] Allow custom comment char

2013-01-15 Thread Ralf Thielow
From: Junio C Hamano gits...@pobox.com Some users do want to write a line that begin with a pound sign, #, in their commit log message. Many tracking system recognise a token of #bugid form, for example. The support we offer these use cases is not very friendly to the end users. They have a

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-15 Thread Ramsay Jones
Mark Levedahl wrote: On 01/11/2013 03:17 PM, Alex Riesen wrote: On Fri, Jan 11, 2013 at 9:08 PM, Alex Riesen raa.l...@gmail.com wrote: This short discussion on GitHub (file git-compat-util.h) might be relevant:

Re: [PATCH v2 07/14] imap-send.c: inline imap_parse_list() in imap_list()

2013-01-15 Thread Matt Kraai
On Tue, Jan 15, 2013 at 09:06:25AM +0100, Michael Haggerty wrote: -static struct imap_list *parse_imap_list(struct imap *imap, char **sp) +static struct imap_list *parse_list(char **sp) The commit subject refers to imap_parse_list and imap_list whereas the code refers to parse_imap_list and

[PATCH v3] am: invoke perl's strftime in C locale

2013-01-15 Thread Dmitry V. Levin
This fixes hg patch format support for locales other than C and en_*. Before the change, git-am was making Date: line from hg changeset metadata according to the current locale, and this line was rejected later with invalid date format diagnostics because localized date strings are not supported.

Re: [PATCH] Allow custom comment char

2013-01-15 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: From: Junio C Hamano gits...@pobox.com Some users do want to write a line that begin with a pound sign, #, in their commit log message. Many tracking system recognise a token of #bugid form, for example. The support we offer these use cases is

Re: [PATCH] am: invoke perl's strftime in C locale

2013-01-15 Thread Junio C Hamano
Dmitry V. Levin l...@altlinux.org writes: On Tue, Jan 15, 2013 at 08:50:59AM -0800, Jeff King wrote: On Tue, Jan 15, 2013 at 05:42:12PM +0100, Antoine Pelisse wrote: This puts all of perl into the C locale, which would mean error messages from perl would be in English rather than the

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Jean-Noël AVILA
Thank you for the explanation. I did not monitor the system calls when writing that patch. Where is the perf framework? As the mistake is located in the find_basename function, I would propose a fix directly into it so that the output fits what the other functions expect. Something in the

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Junio C Hamano
Jean-Noël AVILA avila...@gmail.com writes: Thank you for the explanation. I did not monitor the system calls when writing that patch. Where is the perf framework? As the mistake is located in the find_basename function, I would propose a fix directly into it so that the output fits what

Re: [PATCH v2] test-lib.sh: unfilter GIT_PERF_*

2013-01-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These variables are user parameters to control how to run the perf tests. Allow users to do so. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I think the Subject makes more sense, so I'd suggest replacing the current one with

[RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread John Keeping
Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where we are caught by this, which is when reading refs from git for-each-ref.

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Jean-Noël AVILA
Le mardi 15 janvier 2013 20:29:16, Junio C Hamano a écrit : Jean-Noël AVILA avila...@gmail.com writes: Thank you for the explanation. I did not monitor the system calls when writing that patch. Where is the perf framework? As the mistake is located in the find_basename function, I

Re: [PATCH] remote-hg: store converted URL

2013-01-15 Thread Junio C Hamano
Max Horn m...@quendi.de writes: So far, all I look at do not deal with this at all. Any attempts to deal with it should be pretty easy to recognize: The remote-$backend would have to store something into the git config, or else, verify the opaque token and refuse to work with it under

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-15 Thread Torsten Bögershausen
On 13.01.13 23:38, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: Hi, Torsten Bögershausen wrote: - /^\s*[^#]\s*which\s/ and err 'which is not portable (please use type)'; + /^\s*[^#]\s*which\s+[-a-zA-Z0-9]+$/ and err 'which is not portable (please use type)';

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

2013-01-15 Thread Jonathan Nieder
Michael Haggerty wrote: - else if ((arg1 = next_arg(cmd))) { - if (!strcmp(EXISTS, arg1)) - ctx-gen.count = atoi(arg); - else if (!strcmp(RECENT, arg1)) -

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-01-15 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: What do we think about something like this for fishing for which: --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -644,6 +644,10 @@ yes () { : done } +which () { + echo 2 which is not portable (please use type) +

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Junio C Hamano
Jean-Noël AVILA avila...@gmail.com writes: Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known issue? Which branch? If you mean 'master' with the patch in this discussion applied, I didn't even have a chance to start today's integration cycle, so I don't know (it is not

Re: [PATCH v2 00/14] Remove unused code from imap-send.c

2013-01-15 Thread Jonathan Nieder
Michael Haggerty wrote: imap-send.c | 308 +++- 1 file changed, 55 insertions(+), 253 deletions(-) Patch 14 is lovely. Except for patch 6, for what it's worth these are all Reviewed-by: Jonathan Nieder jrnie...@gmail.com Nicely

Re: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where we are caught by this, which is

[PATCH] config.txt: Document help.htmlpath config parameter

2013-01-15 Thread Sebastian Staudt
Signed-off-by: Sebastian Staudt korak...@gmail.com --- Documentation/config.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index bf8f911..e452ff8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1351,6

Re: [PATCH] config.txt: Document help.htmlpath config parameter

2013-01-15 Thread Junio C Hamano
Thanks. This will eventually go to the maintenance track as well. -- 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: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread John Keeping
On Tue, Jan 15, 2013 at 12:51:13PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one

Re: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: That really feels wrong. Displaying is a separate issue and it is the _right_ thing to punt the problem at the lower-level machinery level. But the display will require decoding the ref name to a Unicode string, which depends on the encoding of the

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

2013-01-15 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Michael Haggerty wrote: -else if ((arg1 = next_arg(cmd))) { -if (!strcmp(EXISTS, arg1)) -ctx-gen.count = atoi(arg); -else if

[RFC/PATCH 2/8 v3] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread John Keeping
Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where we are caught by this, which is when reading refs from git for-each-ref. Fix

Re: [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes

2013-01-15 Thread John Keeping
On Sun, Jan 13, 2013 at 05:52:38PM +, John Keeping wrote: On Sun, Jan 13, 2013 at 12:14:02PM -0500, Pete Wyckoff wrote: j...@keeping.me.uk wrote on Sun, 13 Jan 2013 16:26 +: On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote: j...@keeping.me.uk wrote on Sat, 12 Jan 2013

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

2013-01-15 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: Since actually fixing that is probably too aggressive for this patch, how about a FIXME comment like the following? [...] Hmph; it seems that it is not worth rerolling the whole thing only for this, so let me squash this in,

[PATCH 1/3] Move Git::SVN::get_tz to Git::get_tz_offset

2013-01-15 Thread Ben Walton
This function has utility outside of the SVN module for any routine that needs the equivalent of GNU strftime's %z formatting option. Move it to the top-level Git.pm so that non-SVN modules don't need to import the SVN module to use it. The rename makes the purpose of the function clearer.

[PATCH 3/3] Avoid non-portable strftime format specifiers in git-cvsimport

2013-01-15 Thread Ben Walton
Neither %s or %z are portable strftime format specifiers. There is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: Ben Walton bdwal...@gmail.com --- git-cvsimport.perl

[PATCH 2/3] Allow Git::get_tz_offset to properly handle DST boundary times

2013-01-15 Thread Ben Walton
The Git::get_tz_offset is meant to provide a workalike replacement for the GNU strftime %z format specifier. The algorithm used failed to properly handle DST boundary cases. For example, the unix time 1162105199 in CST6CDT saw set_tz_offset improperly return -0600 instead of -0500. TZ=CST6CDT

[PATCH 0/3] Fix a portability issue with git-cvsimport

2013-01-15 Thread Ben Walton
This patch series started as a quick fix for the use of %s and %z in git-cvsimport but grew slightly when I realized that the get_tz (get_tz_offset after this series) function used by Git::SVN didn't properly handle DST boundary conditions. I realize that Eric Raymond is working to deprecate the

--simplify-merges returns too many references

2013-01-15 Thread Phil Hord
I thought I understood the intent of the various history simplification switches, but maybe I am still confused. In git.git, I see three commits which touch stripspace.c: $ git log --oneline -- builtin/stripspace.c 497215d Update documentation for stripspace c2857fb stripspace: fix outdated

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Jeff King
On Tue, Jan 15, 2013 at 12:49:05PM -0800, Junio C Hamano wrote: Jean-Noël AVILA avila...@gmail.com writes: Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known issue? Which branch? t9902.10 is overly sensitive to extra git commands in your PATH, as well as cruft in

Re: [PATCH 0/3] Fix a portability issue with git-cvsimport

2013-01-15 Thread Junio C Hamano
Ben Walton bdwal...@gmail.com writes: This patch series started as a quick fix for the use of %s and %z in git-cvsimport but grew slightly when I realized that the get_tz (get_tz_offset after this series) function used by Git::SVN didn't properly handle DST boundary conditions. I realize

Re: --simplify-merges returns too many references

2013-01-15 Thread Junio C Hamano
Phil Hord phil.h...@gmail.com writes: But with --simplify-merges, I see _more_ commits. $ git log --simplify-merges --oneline -- builtin/stripspace.c 634392b Add 'contrib/subtree/' from commit ... 497215d Update documentation for stripspace c2857fb stripspace: fix outdated

Re: [PATCH] remote-hg: fix handling of file perms when pushing

2013-01-15 Thread Junio C Hamano
Max Horn m...@quendi.de writes: On 15.01.2013, at 14:02, Max Horn wrote: Previously, when changing and committing an executable file, the file would loose its executable bit on the hg side. Likewise, symlinks ended up as normal files. This was not immediately apparent on the git side unless

Re: [RFC/PATCH 2/8 v3] git_remote_helpers: fix input when running under Python 3

2013-01-15 Thread Pete Wyckoff
j...@keeping.me.uk wrote on Tue, 15 Jan 2013 22:40 +: This is what keeping the refs as byte strings looks like. As John knows, it is not possible to interpret text from a byte string without talking about the character encoding. Git is (largely) a C program and uses the character set

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Duy Nguyen
On Wed, Jan 16, 2013 at 2:14 AM, Jean-Noël AVILA avila...@gmail.com wrote: I did not monitor the system calls when writing that patch. Where is the perf framework? It's in t/perf. I think you can do: ./run HEAD . to run and compare performance of HEAD and working directory (assume you haven't

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

2013-01-15 Thread René Scharfe
Am 15.01.2013 21:27, schrieb Andreas Schwab: René Scharfe rene.scha...@lsrfire.ath.cx writes: +return '\0' - ent-name[key-len]; You need to cast to unsigned char first to make it consistent with memcmp and strcmp. Thanks for catching this! -- 8 -- Subject: [PATCH] refs: use strncmp()

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Duy Nguyen
On Wed, Jan 16, 2013 at 2:29 AM, Junio C Hamano gits...@pobox.com wrote: Jean-Noël AVILA avila...@gmail.com writes: Thank you for the explanation. I did not monitor the system calls when writing that patch. Where is the perf framework? As the mistake is located in the find_basename

Re: What's cooking in git.git (Jan 2013, #06; Mon, 14)

2013-01-15 Thread Adam Spiers
On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano gits...@pobox.com wrote: * as/check-ignore (2013-01-10) 12 commits (merged to 'next' on 2013-01-14 at 9df2afc) + t0008: avoid brace expansion + add git-check-ignore sub-command + setup.c: document get_pathspec() + add.c: extract new

Re: [PATCH 3/3] Avoid non-portable strftime format specifiers in git-cvsimport

2013-01-15 Thread Chris Rorvick
On Tue, Jan 15, 2013 at 5:10 PM, Ben Walton bdwal...@gmail.com wrote: Neither %s or %z are portable strftime format specifiers. There is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Duy Nguyen
On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: Actually I'd like to remove that function. This is what I had in mind: -- 8 -- Subject: [PATCH] attr: avoid calling find_basename() twice per path find_basename() is only used inside collect_all_attrs(), called once in

[PATCH 0/3] Update HTTPD/daemon tests for new push.default

2013-01-15 Thread Brian Gernhardt
I saw a string of these commits already, but found a few more when running the test suite. Brian Gernhardt (3): t5550: do not assume the matching push is the default t5551: do not assume the matching push is the default t5570: do not assume the matching push is the default

[PATCH 2/3] t5551: do not assume the matching push is the default

2013-01-15 Thread Brian Gernhardt
Signed-off-by: Brian Gernhardt br...@gernhardtsoftware.com --- t/t5551-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c5cd2e3..1b55086 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -13,6 +13,7 @@

[PATCH 1/3] t5550: do not assume the matching push is the default

2013-01-15 Thread Brian Gernhardt
Signed-off-by: Brian Gernhardt br...@gernhardtsoftware.com --- t/t5550-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh index 80d20c8..f7d0f14 100755 --- a/t/t5550-http-fetch.sh +++ b/t/t5550-http-fetch.sh @@ -13,6 +13,7 @@

[PATCH 3/3] t5570: do not assume the matching push is the default

2013-01-15 Thread Brian Gernhardt
Signed-off-by: Brian Gernhardt br...@gernhardtsoftware.com --- t/t5570-git-daemon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index a3a4e47..f01edff 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -8,6 +8,7 @@

[PATCH 0/7] guilt patches, including git 1.8 support

2013-01-15 Thread Jonathan Nieder
Hi Jeff and other guilty parties, I collected all the guilt patches I could find on-list and added one of my own. Completely untested, except for running the regression tests. These are also available via git protocol from git://repo.or.cz/guilt/mob.git mob Thoughts? Jonathan Nieder (1):

[GUILT] [PATCH 1/7] get rid of cat: write error: Broken pipe error message

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Tue, 13 Mar 2012 14:39:44 +0100 In some circumstances (like running guilt in a M-x shell buffer in Emacs) cat may give the above error message when the reader of the output from cat exits without reading all input from cat. (In other circumstances cat

[GUILT] [PATCH 2/7] The tests should not fail if log.date or log.decorate are set.

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Mon, 30 Apr 2012 12:25:49 +0200 Explicitly set log.date and log.decorate to their Git default values, so that git produces the expected output even if log.date and log.decorate are set by the user in his .gitconfig. Signed-off-by: Per Cederqvist

[GUILT] [PATCH 3/7] Testsuite: get rid of Broken pipe errors from yes.

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Mon, 30 Apr 2012 12:27:21 +0200 Signed-off-by: Per Cederqvist ced...@opera.com Acked-by: Jeff Sipek jef...@josefsipek.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- regression/t-029.sh | 6 +++--- 1 file changed, 3 insertions(+), 3

[GUILT] [PATCH 4/7] Handle empty patches and patches with only a header.

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Mon, 30 Apr 2012 12:29:55 +0200 git apply --numstat in Git 1.7.10 gives an error message unless the patch contains a diff, so don't attempt to apply it unless we find a '^diff'. Signed-off-by: Per Cederqvist ced...@opera.com Acked-by: Jeff Sipek

[GUILT] [PATCH 5/7] Fix fatal guilt graph error in sha1sum invocation.

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Wed, 14 Mar 2012 14:34:38 +0100 Fix the compatibility function sha1 so that it reads from stdin (and not a file with a zero-length file name) when no argument is supplied. [jn: adapted to also handle newer versions of OpenSSL, based on reports from

[GUILT] [PATCH 6/7] Change git branch when patches are applied.

2013-01-15 Thread Jonathan Nieder
From: Per Cederqvist ced...@opera.com Date: Mon, 30 Apr 2012 12:24:06 +0200 Apply patches on a separate branch. The separate branch is automatically created when Guilt pushes something, and removed when no patches are applied. The name is formed by prepending guilt/ to the original branch. This

[GUILT] [PATCH 7/7] Drop unneeded git version check.

2013-01-15 Thread Jonathan Nieder
Git's compatibility record is pretty good, so there's no need to worry that newer versions of git will break the git config command. Without this change, guilt errors out for git 1.8. With it, all tests pass. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Thanks for reading. guilt | 11

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: Actually I'd like to remove that function. This is what I had in mind: I think the replacement logic to find the basename is moderately inferiour to the original. For one thing (this may be

Re: What's cooking in git.git (Jan 2013, #06; Mon, 14)

2013-01-15 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano gits...@pobox.com wrote: * as/check-ignore (2013-01-10) 12 commits (merged to 'next' on 2013-01-14 at 9df2afc) + t0008: avoid brace expansion + add git-check-ignore sub-command + setup.c: document

  1   2   >