[PATCH/RFC] fast-import doc: split OPTIONS into subsections

2013-01-06 Thread Jonathan Nieder
edges). 5. Performance and compression tuning. Reported-by: John Keeping j...@keeping.me.uk Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- The second-to-last subsection (Import Semantics) is kind of a catch-all. Better ideas for organization or naming would be welcome. Documentation/git-fast

Re: [PATCH] git-fast-import(1): reorganise options

2013-01-06 Thread Jonathan Nieder
John Keeping wrote: How about this? Ah, our patches crossed. I left the Semantics of execution options with the general options since I couldn't think of a sensible heading Neat trick. :) [...] -- 8 -- The options in git-fast-import(1) are not currently arranged in a logical order,

Re: [PATCH v4] git-clean: Display more accurate delete messages

2013-01-06 Thread Jonathan Nieder
Zoltan Klinger wrote: $ git clean -fd Removing tracked_dir/some_untracked_file Removing untracked_file Removing untracked_foo/ Removing untracked_some.git/ The message displayed to the user is slightly misleading. The foo/ directory has not been removed because of foo/frotz.git

Re: Moving (renaming) submodules, recipe/script

2013-01-06 Thread Jonathan Nieder
(just cc-ing Jens and Peter, who might be interested) W. Trevor King wrote: Today I had to move my first submodule, and I discovered that Git's support for this is pretty limited. There have been a few patch series attempting to address this [1,2], but none of them seems to have pushed

Re: [PATCH 1/4] t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead

2013-01-06 Thread Jonathan Nieder
, and it even makes the quoting consistent so a person can put their copy of unzip under /Program Files. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH 2/4] t0024, t5000: use test_lazy_prereq for UNZIP

2013-01-07 Thread Jonathan Nieder
: now that this is part of a test, there is no more need to silence its output. The unzip -v output could be useful to people debugging with t0024-crlf-archive.sh -v -i. With or without that change, this is a nice cleanup and obviously correct, so Reviewed-by: Jonathan Nieder jrnie...@gmail.com

Re: [PATCH 4/4] t5002: check if unzip supports symlinks

2013-01-07 Thread Jonathan Nieder
René Scharfe wrote: Only add a symlink to the repository if both the filesystem and unzip support symlinks. To check the latter, add a ZIP file containing a symlink, created like this with InfoZIP zip 3.0: $ echo sample text textfile $ ln -s textfile symlink $ zip -y

Re: [PATCH] add warning for depth=0 in git clone.

2013-01-08 Thread Jonathan Nieder
Stefan Beller wrote: I am struggling a little with the development process, is a sign-off strictly required for git as it is for kernel development? Yes. Documentation/SubmittingPatches has more hints. Signed-off-by: Stefan Beller stefanbel...@googlemail.com This adds a warning and the

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-08 Thread Jonathan Nieder
Hi, Ralf Thielow wrote: The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. Could you give an example? I'm trying to get a sense of whether these habitual

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-09 Thread Jonathan Nieder
Ralf Thielow wrote: It's actually my own usecase :). The bugtracker I'm using is able to create relationships between issues and related commits. It expects that a part of the commit message contains the issue number in format #issueId. So I need to use a cleanup mode different from default

Re: [PATCH v2 1/2] git-fast-import(1): combine documentation of --[no-]relative-marks

2013-01-09 Thread Jonathan Nieder
John Keeping wrote: The descriptions of '--relative-marks' and '--no-relative-marks' make more sense when read together instead of as two independent options. Combine them into a single description block. Yep, this is easier to read. Thanks. Reviewed-by: Jonathan Nieder jrnie...@gmail.com

Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases

2013-01-09 Thread Jonathan Nieder
Junio C Hamano wrote: Jeff King p...@peff.net writes: But we still say error: ... died of signal 13, because that comes from inside wait_or_whine. So it is a separate issue whether or not wait_or_whine should be silent on SIGPIPE (we already are on SIGINT and SIGQUIT, as of some recent

Re: [PATCH 4/4] t5002: check if unzip supports symlinks

2013-01-09 Thread Jonathan Nieder
René Scharfe wrote: Am 07.01.2013 09:52, schrieb Jonathan Nieder: Hm. Do some implementations of unzip not support symlinks, or is the problem that some systems build Info-ZIP without the SYMLINKS option? The unzip supplied with NetBSD 6.0.1, which is based on libarchive, doesn't support

[PATCH] contrib/vim: simplify instructions for old vim support

2013-01-10 Thread Jonathan Nieder
if they are this simple it's effortless to keep them. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Jeff King wrote: I'd argue that we should just remove contrib/vim at this point. It has no actual files in it, only pointers to vim.org for pre-7.2 vim users. I think that's reasonable. Of course we can still

Re: [PATCH] minor diff between gitweb docs and actual template for $GIT/description

2013-01-10 Thread Jonathan Nieder
(+cc: Jakub, who maintains gitweb) Hi Tim, Tim Chase wrote: The documentation for gitweb gives one description of the default content for the $GIT/description, the description template has other text. One of these two patches should be applied to bring them into order (applying both would

Re: [PATCH] cvsimport: rewrite to use cvsps 3.x to fix major bugs

2013-01-12 Thread Jonathan Nieder
Hi Eric, Eric S. Raymond wrote: But in practice the git crew was going to lose that capability anyway simply because the new wrapper will support three engines rather than just one. It's not practical for the git tests to handle that many variant external dependencies. See the

Re: [PATCH] cvsimport: rewrite to use cvsps 3.x to fix major bugs

2013-01-12 Thread Jonathan Nieder
Michael Haggerty wrote: Regarding your claim that within a few months the Perl git-cvsimport is going to cease even pretending to work: It might be that the old git-cvsimport will stop working *for people who upgrade to cvsps 3.x*. But it is not realistic to expect people to synchronize their

Re: git list files

2013-01-13 Thread Jonathan Nieder
Hi, Стойчо Слепцов wrote: lets, say the equivalent of the $ls -d b* within git.git root directory would look like: 98746061 jrnieder 2010-08-12 17:11 Standardize-do-.-while-0-style base85.c c43cb386 pclouds 2012-10-26 22:53 Move-estimate_bisect_steps-to-li bisect.c

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

2013-01-13 Thread Jonathan Nieder
. Intentional? With the below squashed in, Reviewed-by: Jonathan Nieder jrnie...@gmail.com diff --git i/imap-send.c w/imap-send.c index 451d5027..f1c8f5a5 100644 --- i/imap-send.c +++ w/imap-send.c @@ -1296,7 +1296,7 @@ static int imap_store_msg(struct store *gctx, struct msg_data *msg

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

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: --- a/imap-send.c +++ b/imap-send.c [...] @@ -772,13 +767,10 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd) !strcmp(NO, arg) || !strcmp(BYE, arg)) { if ((resp =

Re: cvs-fast-export release announcement

2013-01-13 Thread Jonathan Nieder
Eric S. Raymond wrote: cvs-fast-export. Project page, with links to documentation and the public repository, is at http://www.catb.org/esr/cvs-fast-export/. Yay, thanks for building this. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

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

2013-01-13 Thread Jonathan Nieder
-by: Jonathan Nieder jrnie...@gmail.com 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 11/14] imap-send.c: simplify logic in lf_to_crlf()

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- imap-send.c | 31 --- 1 file changed, 8 insertions(+), 23 deletions(-) I like the code reduction, but my nighttime brain doesn't have the patience to understand the preimage or

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

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: In fact, all struct store instances are upcasts of struct imap_store anyway, so stop making the distinction. Nice. It is tempting to fold struct store into struct imap_store at the same time, as in struct imap_store { struct {

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

2013-01-13 Thread Jonathan Nieder
Michael Haggerty wrote: imap-send.c | 286 +--- 1 file changed, 39 insertions(+), 247 deletions(-) See my replies for comments on patches 1, 6, 9, 11, and 12. The rest are Reviewed-by: Jonathan Nieder jrnie...@gmail.com The series

Re: git list files

2013-01-13 Thread Jonathan Nieder
Jeff King wrote: As far as I recall, that script works. However, I have a pure-C blame-tree implementation that is much faster, which may also be of interest. I need to clean up and put a few finishing touches on it to send it to the list, but it has been in production at GitHub for a few

Re: Announcing git-reparent

2013-01-13 Thread Jonathan Nieder
Hi Mark, Mark Lodato wrote: Create a new commit object that has the same tree and commit message as HEAD but with a different set of parents. If ``--no-reset`` is given, the full object id of this commit is printed and the program exits I've been wishing for something like this for a long

Re: [PATCH v2 0/6] A smoother transition plan for cvsimport

2013-01-13 Thread Jonathan Nieder
Junio C Hamano wrote: Junio C Hamano (6): Makefile: add description on PERL/PYTHON_PATH cvsimport: allow setting a custom cvsps (2.x) program name cvsimport: introduce a version-switch wrapper cvsimport: start adding cvsps 3.x support cvsimport: make tests reusable for cvsimport-3

Re: [PATCH 3/6] convert some config callbacks to match_config_key

2013-01-14 Thread Jonathan Nieder
Jeff King wrote: --- a/convert.c +++ b/convert.c @@ -465,10 +465,8 @@ static int read_convert_config(const char *var, const char *value, void *cb) * External conversion drivers are configured using * filter.name.variable. */ - if (prefixcmp(var, filter.) || (ep =

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 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 done

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

[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
is just silently terminated with SIGPIPE.) Get rid of the error by removing the useless use of cat in do_get_header and do_get_full_header. Signed-off-by: Per Cederqvist ced...@opera.com Acked-by: Jeff Sipek jef...@josefsipek.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- guilt | 8

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

2013-01-15 Thread Jonathan Nieder
...@opera.com Acked-by: Jeff Sipek jef...@josefsipek.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- regression/scaffold | 4 1 file changed, 4 insertions(+) diff --git a/regression/scaffold b/regression/scaffold index 8769058..9db79a9 100644 --- a/regression/scaffold +++ b/regression

[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 deletions

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

2013-01-15 Thread Jonathan Nieder
...@josefsipek.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- guilt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guilt b/guilt index 7f6806e..5bcc498 100755 --- a/guilt +++ b/guilt @@ -611,7 +611,7 @@ push_patch() cd_to_toplevel

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

2013-01-15 Thread Jonathan Nieder
-by: Per Cederqvist ced...@opera.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- os.Darwin | 7 ++- os.Linux | 7 ++- os.SunOS | 7 ++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/os.Darwin b/os.Darwin index 470f5fb..3f23121 100644 --- a/os.Darwin +++ b

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

2013-01-15 Thread Jonathan Nieder
-off-by: Jonathan Nieder jrnie...@gmail.com --- This one was a bit experimental if I remember correctly, so you may want to skip it or make the feature optional. Documentation/guilt.7 | 4 + guilt | 52 +- guilt-branch | 12 +- guilt-commit | 7 + guilt

[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 v3] test-lib.sh: unfilter GIT_PERF_*

2013-01-16 Thread Jonathan Nieder
Nguyễn Thái Ngọc Duy wrote: 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 FWIW, of the three versions proposed, this one makes the most sense to me. Looks good. -- To unsubscribe from

Re: [PATCH] Add Auto-Submitted header to post-receive-email

2013-01-16 Thread Jonathan Nieder
. I'm not Andy, but it sounds very sane to me. So for what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks, Jonathan (patch left unsnipped for reference) This conforms to RFC3834 and is useful in preventing eg vacation auto-responders from replying by default Signed-off

Re: Changing Spell checker under GIT

2013-01-17 Thread Jonathan Nieder
Hi Mike, Mike Hall wrote: As my organization has change from RedHat 5 to RedHat 6 Linux, it appears that RedHat is trying to replace (deprecate) ispell/aspell with a different tool (hunspell). It appears that GIT GUI current supports changing the dictionary used to support spell checks.

Re: t9902 fails (Was: [PATCH] attr: fix off-by-one directory component length calculation)

2013-01-17 Thread Jonathan Nieder
problems due to existence of, for example, a git cherry-pick-branches command. Thoughts? Maybe it would be enough to check that the intended get commands are present in the completion list and other git commands are not, ignoring binaries that might live elsewhere on the $PATH? Signed-off-by: Jonathan

Re: tar-tree.c dereferencing pointer to incomplete type

2013-01-19 Thread Jonathan Nieder
白い熊 wrote: On Sat, Jan 19, 2013 at 6:26 PM, 白い熊 shiroik...@shiroikuma.org wrote: Moved it and compiles fine. In fact I moved it back now, so it should be finding it again and it still builds fine, no trace of the prior error. I'm dumbfounded! But at least it compiles... OK, figured it out.

Re: [RFC] git rm -u

2013-01-19 Thread Jonathan Nieder
Eric James Michael Ritz wrote: When I came to my senses and realized that does not work I began to wonder if `git rm -u` should exist. If any deleted, tracked files are not part of the index to commit then `git rm -u` would add that change to the index. I like it. If you have time to write

Re: [PATCH 0/2] GIT, Git, git

2013-01-19 Thread Jonathan Nieder
Hi Thomas, Thomas Ackermann wrote: Git changed its 'official' system name from 'GIT' to 'Git' in v1.6.5.3 (as can be seen in the corresponding release note where 'GIT' was changed to 'Git' in the header line). Alas the documention uses 'GIT', 'Git' or even 'git' to refer to the Git

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-20 Thread Jonathan Nieder
Ramsay Jones wrote: --- a/git-compat-util.h +++ b/git-compat-util.h @@ -85,12 +85,6 @@ #define _NETBSD_SOURCE 1 #define _SGI_SOURCE 1 -#ifdef WIN32 /* Both MinGW and MSVC */ -#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */ -#include winsock2.h -#include

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-20 Thread Jonathan Nieder
Torsten Bögershausen wrote: I wonder, if if we can go one step further: Replace #ifdef WIN32 /* Both MinGW and MSVC */ [...] with #if defined(_MSC_VER) I thought Git for Windows was built using mingw, which doesn't define _MSC_VER? Puzzled, Jonathan -- To unsubscribe from this list: send

Re: git-cvsimport-3 and incremental imports

2013-01-20 Thread Jonathan Nieder
Eric S. Raymond wrote: You get to integrate this. I think the transition strategy Junio has chosen is seriously mistaken, leading to unnecessary grief for users who will be fooled into thinking it's OK to still use cvsps-2.x. So our choices are: a. support current users, offend ESR, don't

Re: git-cvsimport-3 and incremental imports

2013-01-20 Thread Jonathan Nieder
Eric S. Raymond wrote: You get to integrate this. I think the transition strategy Junio has chosen is seriously mistaken, leading to unnecessary grief for users who will be fooled into thinking it's OK to still use cvsps-2. Ah, I missed a detail on first reading. I think there has been a

Re: git-cvsimport-3 and incremental imports

2013-01-20 Thread Jonathan Nieder
Eric S. Raymond wrote: I have said everything I could about the bad effects of encouraging people to continue to use cvsps-2.x, it didn't budge Junio an inch, and I'm tired of fighting about it. What I think you misunderstood is that Junio is not the person you would have needed to convince.

Re: [RFC/PATCH] add: warn when -u or -A is used without filepattern

2013-01-21 Thread Jonathan Nieder
Hi, Matthieu Moy wrote: The inconsistancy of 'git add -u' and 'git add -A' are particularly problematic since other 'git add' subcommands (namely 'git add -p' and 'git add -e') are tree-wide by default. Flipping the default now is unacceptable, so this patch starts training users to type

Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer

2013-01-21 Thread Jonathan Nieder
Hi, Brandon Casey wrote: --- a/sequencer.c +++ b/sequencer.c [...] @@ -1042,13 +1041,8 @@ static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) Git is checking if (sb-buf) ends with a Signed-off-by: style line. If it doesn't, it will need to add an extra blank line before

Re: [PATCH v2 02/10] t/test-lib-functions.sh: allow to specify the tag name to test_commit

2013-01-22 Thread Jonathan Nieder
with the given tag name. # # file, contents, and tag all default to message. With or without that change, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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

Re: [PATCH v2 03/10] t/t3511: add some tests of 'cherry-pick -s' functionality

2013-01-22 Thread Jonathan Nieder
will be recording it in permanent history. Signed-off-by: $GIT_COMMITTER_NAME $GIT_COMMITTER_EMAIL Signed-off-by: A U Thor aut...@example.com With the changes suggested above or similar ones, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line

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

2013-01-22 Thread Jonathan Nieder
for what it's worth, Acked-by: Jonathan Nieder jrnie...@gmail.com -- 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 v2 05/10] sequencer.c: always separate (cherry picked from from commit body

2013-01-22 Thread Jonathan Nieder
Brandon Casey wrote: Start treating the (cherry picked from line added by cherry-pick -x the same way that the s-o-b lines are treated. Namely, separate them from the main commit message body with an empty line. Heh, you read my mind. -- To unsubscribe from this list: send the line

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

2013-01-22 Thread Jonathan Nieder
Brandon Casey wrote: Teach append_signoff how to detect a duplicate s-o-b in the commit footer. This is in preparation to unify the append_signoff implementations in log-tree.c and sequencer.c. [...] --- a/sequencer.c +++ b/sequencer.c @@ -1082,9 +1101,10 @@ int

Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer

2013-01-22 Thread Jonathan Nieder
Brandon Casey wrote: On Mon, Jan 21, 2013 at 11:54 PM, Jonathan Nieder jrnie...@gmail.com wrote: First (snipped), it seeks back two newlines from the end and then forward to the next non-newline character, so (buf + i) is at the start of the last line of (the interesting part of) sb. Did

Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer

2013-01-22 Thread Jonathan Nieder
Jonathan Nieder wrote: Here is the loop in master: int hit = 0; [...] for (i = len - 1; i 0; i--) { if (hit buf[i] == '\n') break; hit = (buf[i] == '\n'); } I don't see any adjacency check. Of course that's

Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer

2013-01-22 Thread Jonathan Nieder
Brandon Casey wrote: On Mon, Jan 21, 2013 at 11:54 PM, Jonathan Nieder jrnie...@gmail.com wrote: - if ((buf[k] == ' ' || buf[k] == '\t') !first) - continue; This is always the first line examined, so this continue never triggers. This is just totally

Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer

2013-01-22 Thread Jonathan Nieder
Jonathan Nieder wrote: line) instead of buf[i] is a whitespace character. So for example, it confuses the following for a well-formed RFC2822 footer: Luckily it doesn't, since the final continuation line is not followed by whitespace. I should have said

Re: [PATCHv2 0/8] config key-parsing cleanups

2013-01-22 Thread Jonathan Nieder
Jeff King wrote: So I've re-rolled the original version Lovely. :) Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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

Re: GIT get corrupted on lustre

2013-01-23 Thread Jonathan Nieder
Thomas Rast wrote: Taken together this should mean that the bug is in fact simply that the calls do not *restart*. They are (like you say) allowed to return EINTR despite not being specified to, *but* SA_RESTART should restart it. Now, does that make it a lustre bug or a glibc bug? :-) The

Re: [PATCH] git-svn: cleanup sprintf usage for uppercasing hex

2013-01-23 Thread Jonathan Nieder
Eric Wong wrote: We do not need to call uc() separately for sprintf(%x) as sprintf(%X) is available. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH] t9902: protect test from stray build artifacts

2013-01-24 Thread Jonathan Nieder
Jeff King wrote: On Thu, Jan 24, 2013 at 03:07:42PM -0800, Junio C Hamano wrote[1]: Instrument the completion script and give it a way for us to tell what (subset of) subcommands we are going to ship. [...] The only thing I might add is a test just to double-check that git help -a is parsed

Re: segmentation fault (nullpointer) with git log --submodule -p

2013-01-24 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: I've been toying with an idea along this line. Heh. Just for fun, here's an uglier version: struct wcb_data { int had_buffer; int using_buffer; }; #define WITH_COMMIT_BUFFER_DATA_INIT { 0, 0 } extern

[PATCH/RFC] mingw: rename WIN32 cpp macro to NATIVE_WINDOWS

2013-01-25 Thread Jonathan Nieder
the CYGWIN_V15_WIN32API setting without any negative effect. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Eric Blake wrote: Which is why other projects, like gnulib, have # if (defined _WIN32 || defined __WIN32__) ! defined __CYGWIN__ all over the place. So, how about this? Completely untested

Re: [PATCH 1/2] fetch: run gc --auto after fetching

2013-01-26 Thread Jonathan Nieder
Jeff King wrote: --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -959,6 +959,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) struct string_list list = STRING_LIST_INIT_NODUP; struct remote *remote; int result = 0; + static const char

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

2013-01-27 Thread Jonathan Nieder
Hi, Torsten Bögershausen wrote: On 15.01.13 21:38, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: What do we think about something like this for fishing for which: [...] +which () { + echo 2 which is not portable (please use type) + exit 1 +} [...] if (

Re: [PATCH 2/2] fetch-pack: avoid repeatedly re-scanning pack directory

2013-01-27 Thread Jonathan Nieder
Hi, Jeff King wrote: When we look up a sha1 object for reading, we first check packfiles, and then loose objects. If we still haven't found it, we re-scan the list of packfiles in `objects/pack`. This final step ensures that we can co-exist with a simultaneous repack process which creates a

Re: [PATCH v2 3/3] branch: mark more strings for translation

2013-01-27 Thread Jonathan Nieder
for the commit message column in the f7c0c00 [ahead 58, behind 197] vcs-svn: drop obj_pool.h message). For what it's worth, assuming this passes tests, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH v2 2/3] branch: give a more helpful message on redundant arguments

2013-01-27 Thread Jonathan Nieder
Nguyễn Thái Ngọc Duy wrote: --- a/builtin/branch.c +++ b/builtin/branch.c @@ -852,14 +852,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix) const char *branch_name; struct strbuf branch_ref = STRBUF_INIT; - if (detached) -

Re: [PATCH v2] add: warn when -u or -A is used without filepattern

2013-01-27 Thread Jonathan Nieder
/--update/-u/, Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks. If someone wants to preserve the spelling of the option name passed by the user, that can happen as a patch on top. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH 2/2] fetch-pack: avoid repeatedly re-scanning pack directory

2013-01-27 Thread Jonathan Nieder
Junio C Hamano wrote: It is not about a rough estimate nor common commits, though. The everything local check in question is interested in only one thing: are we _clearly_ up to date without fetching anything from them? [...] Jonathan Nieder jrnie...@gmail.com writes: * Why is 49bb805e

Re: [PATCH v2 03/10] t/t3511: add some tests of 'cherry-pick -s' functionality

2013-01-27 Thread Jonathan Nieder
-by: $GIT_COMMITTER_NAME $GIT_COMMITTER_EMAIL Yep, that looks better than the example I suggested. :) [...] On Tue, Jan 22, 2013 at 12:17 AM, Jonathan Nieder jrnie...@gmail.com wrote: One more test would be interesting: what does -s do when asked to produce a duplicate signoff with an interspersed

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

2013-01-27 Thread Jonathan Nieder
Hi, Brandon Casey wrote: Let's detect (cherry picked from...) as part of the footer so that we will produce this: Signed-off-by: A U Thor aut...@example.com (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) Signed-off-by: C O Mmitter commit...@example.com instead of

Re: [PATCH v3 01/11] sequencer.c: rework search for start of footer to improve clarity

2013-01-27 Thread Jonathan Nieder
--) { char ch = buf[i]; if (prev == '\n' ch == '\n') /* paragraph break */ break; prev = ch; } but your rewrite is just as clear. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe

Re: [PATCH v3 02/11] commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: sequencer.c | 6 -- 1 file changed, 6 deletions(-) Nice simplification. Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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

Re: [PATCH v3 04/11] t/t3511: add some tests of 'cherry-pick -s' functionality

2013-01-27 Thread Jonathan Nieder
whether to add a newline before a new signoff, it forgot to change the sign-off already present case to match. Thanks for the test. The rest of the tests in this file also look good, of course. Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line

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

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: Let's detect (cherry picked from...) as part of the footer so that we will produce this: Signed-off-by: A U Thor aut...@example.com (cherry picked from da39a3ee5e6b4b0d3255bfef95601890afd80709) Signed-off-by: C O Mmitter commit...@example.com instead of this:

Re: [PATCH v3 06/11] sequencer.c: always separate (cherry picked from from commit body

2013-01-27 Thread Jonathan Nieder
test_cmp expect actual ' +test_expect_success 'cherry-pick -x inserts blank line when conforming footer not found' ' Yay. :) Thanks for a clear and well thought-out patch with thorough tests. Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line

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

2013-01-27 Thread Jonathan Nieder
Jonathan Nieder wrote: Here's the tweak I suggested last time. I think its behavior is slightly better in the ends with incomplete line case because it limits the characters examined by is_rfc2822_line() and is_cherry_picked_from_line() not to include buf[len] (which would presumably

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

2013-01-27 Thread Jonathan Nieder
and this logic to scan all lines for the sign-off can probably be ripped out soon I don't mind. The general direction is good and the execution looks obviously correct. Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

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

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: --- a/sequencer.c +++ b/sequencer.c [...] @@ -1096,10 +1117,16 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer) strbuf_addch(sob, '\n'); for (i = msgbuf-len - 1 - ignore_footer; i 0 msgbuf-buf[i - 1] != '\n'; i--) ; /* do

Re: [PATCH v3 08/11] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and avoid adding an additional one if one already exists. This is necessary to allow format-patch to add a s-o-b to a patch with no commit message

Re: [PATCH v3 11/11] Unify appending signoff in format-patch, commit and sequencer

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: --- a/log-tree.c +++ b/log-tree.c [...] @@ -208,94 +207,6 @@ void show_decorations(struct rev_info *opt, struct commit *commit) putchar(')'); } -/* - * Search for ^[-A-Za-z]+: [^@]+@ pattern. It usually matches - * Signed-off-by: and Acked-by: lines. - */

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

2013-01-27 Thread Jonathan Nieder
Brandon Casey wrote: Round 3. Thanks for a pleasant read. My only remaining observations are cosmetic, except for a portability question in Duy's test script, a small behavior change when the commit message ends with an RFC2822-style header with no trailing newline and the possibility of

Re: [PATCH v4 1/2] for-each-repo: new command used for multi-repo operations

2013-01-28 Thread Jonathan Nieder
Hi, Lars Hjemli wrote: [1] The 'git -a' rewrite patch shows how I think about this command - it's just an option to the 'git' command, modifying the way any subcommand is invoked (btw: I don't expect that patch to be applied since 'git-all' was deemed to generic, so I'll just carry the patch

Re: [PATCH v3] add: warn when -u or -A is used without filepattern

2013-01-28 Thread Jonathan Nieder
Matthieu Moy wrote: Signed-off-by: Matthieu Moy matthieu@imag.fr Looks good to me. At some point we'll want to have tests for this case, but that's not particularly urgent until it's time for the warning() to turn into a die(). Thanks. Jonathan -- To unsubscribe from this list: send the

Re: Bug: file named - on git commit

2013-01-28 Thread Jonathan Nieder
Hi, Thomas Rast wrote: Rene Moser m...@renemoser.net writes: Found a little issue in git version 1.7.9.5 if a file named -, causing git commit to read from stdin. (So you must hit ctrl-d or ctrl-c to finish the commit.) [...] This was fixed by Junio around 4682d85 (diff-index.c: git diff

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
(cc-ing some area experts) Hi Andrej, Andrej Andb wrote: [Subject: remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server] Sounds good to me. May we have your signoff? (See Documentation/SubmittingPatches for what this means.) Thanks,

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
Junio C Hamano wrote: Andrej Andb wrote: --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) { my ($user, $domain) = split('@', $email); $avatar_cache{$email} = -

Re: [PATCH] remove protocol from gravatar and picon links for clear if Gitweb is being called through a secure server

2013-01-28 Thread Jonathan Nieder
Junio C Hamano wrote: I am sure mixed content warning was the primary motivation of the patch. Sure, but that's not enough motivation for me to like it. ;-) The privacy aspect is enough to motivate it for me. Do we know these external sites actually server what we want over

Re: [PATCH] The images from picon and gravatar are always used over http://, and browsers give mixed contents warning when gitweb is served over https://.

2013-01-28 Thread Jonathan Nieder
Hi Bryan, Bryan Turner wrote: This won't work correctly as-is. The secure URL for Gravatar is https://secure.gravatar.com[1], not https://www.gravatar.com;. Odd. https://www.gravatar.com/; also seems to work. I've put in a technical support query to find out what the Gravatar admins prefer.

Re: [PATCH v2] status: show the branch name if possible in in-progress info

2013-01-29 Thread Jonathan Nieder
Hi Duy, Nguyễn Thái Ngọc Duy wrote: --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -76,7 +76,7 @@ test_expect_success 'status when rebase in progress before resolving conflicts' test_must_fail git rebase HEAD^ --onto HEAD^^ cat expected -\EOF # Not

Re: [PATCH] branch: show (rebasing) or (bisecting) instead of (no branch) when possible

2013-01-29 Thread Jonathan Nieder
Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- In the spirit of status' in-progress info. I think showing this is more useful than (no branch). I tend to do git br more often than git st and this catches my eyes. Very nice idea. This would also

Re: gitk doesn't always shows boths tags in gitk tag1..tag2

2013-01-29 Thread Jonathan Nieder
Hi Toralf, Toralf Förster wrote: $ git clone git://boinc.berkeley.edu/boinc.git the following 2 commands shows both starting and ending revisions : $ gitk client_release_7.0.41..client_release_7.0.42 gitk is running something similar to git log --graph --decorate --boundary

Re: [BUG] incorrect search result returned when using git log with a future date parameter

2013-01-30 Thread Jonathan Nieder
Junio C Hamano wrote: When it is fed 2013-02-12, it is ambiguous and approxidate can and should use whatever heuristics (including rejection of future) to guess what the user wanted, but 2013-02-13 cannot be interpreted in any other way, so we should parse it as such. FWIW, if you said

<    3   4   5   6   7   8   9   10   11   12   >