Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread Jens Lehmann
Am 07.01.2013 08:44, schrieb Junio C Hamano: > Jens Lehmann writes: > >> Am 07.01.2013 02:39, schrieb Jonathan Nieder: >>> (just cc-ing Jens and Peter, who might be interested) >> >> I´m currently working on teaching mv to move submodules and intend >> to send those patches to the list after fini

Re: [PATCH] status: report ignored yet tracked directories

2013-01-07 Thread Jeff King
On Sun, Jan 06, 2013 at 05:40:46PM +0100, Antoine Pelisse wrote: > > Looking at your fix and remembering how the index hashing works, I think > > the answer is that: > > > > 1. This bug only affects directories, because they are the only thing > > that can be simultaneously "ignored and unt

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

2013-01-07 Thread Jonathan Nieder
René Scharfe wrote: > --- a/t/t0024-crlf-archive.sh > +++ b/t/t0024-crlf-archive.sh > @@ -5,6 +5,11 @@ test_description='respect crlf in git archive' > . ./test-lib.sh > GIT_UNZIP=${GIT_UNZIP:-unzip} > > +test_lazy_prereq UNZIP ' > + "$GIT_UNZIP" -v >/dev/null 2>&1 > + test $? -ne 127

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

RE: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-07 Thread Pyeron, Jason J CTR (US)
> -Original Message- > From: Junio C Hamano > Sent: Monday, January 07, 2013 2:29 AM > > Jason Pyeron writes: > > [administrivia: please never cull CC list when you respond to a > message on this list without a good reason] Apologies, I just have 4 copies of every message and was trying

Re: recovering a corrupted git repo

2013-01-07 Thread Christian Couder
On Mon, Jan 7, 2013 at 4:44 AM, Phillip Susi wrote: > > I have not had any issue until I ran a git fsck recently, which > repored gzip and crc errors in some pack files. git fsck does not > seem to repair the errors, only report them. I would like to try to > rebuild my repository, without downl

Re: What's cooking in git.git (Jan 2013, #03; Sun, 6)

2013-01-07 Thread John Keeping
On Sun, Jan 06, 2013 at 06:42:16PM -0800, Junio C Hamano wrote: > * jk/maint-fast-import-doc-dedup-done (2013-01-05) 1 commit > - git-fast-import(1): remove duplicate "--done" option > > Will merge to 'next' and 'master' as a quick "oops" fix. > > The "logical order" reorganization can come af

[PATCH v2] git-fast-import(1): remove duplicate '--done' option

2013-01-07 Thread John Keeping
On Sat, Jan 05, 2013 at 04:06:52PM +, John Keeping wrote: The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping --- Changed since v1:

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread W. Trevor King
On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: > I´m currently working on teaching mv to move submodules and intend > to send those patches to the list after finishing submodule deinit. > Please see > https://github.com/jlehmann/git-submod-enhancements/commits/mv-submodules > for t

Re: [PATCH v4] git-completion.bash: add support for path completion

2013-01-07 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 05/01/2013 21:23, Marc Khouzam ha scritto: > [...] > Below are two suggestions that are in line with this effort but that are not > regressions. > > A) It would be nice if > git commit -a > also completed with untracked files > $ git commit -a

Re: [BUG] two-way read-tree can write null sha1s into index

2013-01-07 Thread Jeff King
On Thu, Jan 03, 2013 at 02:33:09PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Oh, I agree it's insane to try to carry through unmerged entries. I'm > > just concerned that not all code paths are careful enough to check. > > I would actually be surprised if some code path do assume s

Re: [PATCH 1/8] Use %B for Split Subject/Body

2013-01-07 Thread Techlive Zheng
2013/1/1 Junio C Hamano : > "David A. Greene" writes: > >> From: Techlive Zheng >> >> Use %B to format the commit message and body to avoid an extra newline >> if a commit only has a subject line. > > Is this an unconditional improvement, or is it generally an > improvement but for some users it

RE: [PATCH v4] git-completion.bash: add support for path completion

2013-01-07 Thread Marc Khouzam
> -Original Message- > From: git-ow...@vger.kernel.org > [mailto:git-ow...@vger.kernel.org] On Behalf Of Manlio Perillo > Sent: Monday, January 07, 2013 8:43 AM > To: Marc Khouzam > Cc: Junio C Hamano; git@vger.kernel.org; sze...@ira.uka.de; > felipe.contre...@gmail.com > Subject: Re: [P

Re: [PATCH 1/8] Use %B for Split Subject/Body

2013-01-07 Thread Techlive Zheng
2013/1/1 Junio C Hamano : > "David A. Greene" writes: > >> From: Techlive Zheng >> >> Use %B to format the commit message and body to avoid an extra newline >> if a commit only has a subject line. > > Is this an unconditional improvement, or is it generally an > improvement but for some users it

Re: [BUG/PATCH] setup: Copy an environment variable to avoid overwrites

2013-01-07 Thread Erik Faye-Lund
On Sat, Jan 5, 2013 at 1:35 AM, David Michael wrote: > It is possible for this pointer of the GIT_DIR environment variable to > survive unduplicated until further getenv calls are made. The standards > allow for subsequent calls of getenv to overwrite the string located at > its returned pointer,

Re: [PATCH] Add getenv.so for catching invalid getenv() use via LD_PRELOAD

2013-01-07 Thread David Michael
Hi, On Sat, Jan 5, 2013 at 3:55 AM, Nguyễn Thái Ngọc Duy wrote: > Perhaps this will help the getenv bug hunting (I assume we do the > hunting on Linux platform only). So far it catches this and is stuck > at getenv in git_pager(). For the record: I have been testing a macro pointing getenv at

Re: Moving (renaming) submodules, recipe/script

2013-01-07 Thread Junio C Hamano
Jens Lehmann writes: > Right, and me thinks that would warrant a --force option for deinit > to do that even if the submodule contains local changes (which would > make deinit fail otherwise). Probably. > Additionally Michael and Marc spoke up > that they would rather have a --all option to dei

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

2013-01-07 Thread René Scharfe
Am 07.01.2013 06:16, schrieb Jonathan Nieder: René Scharfe wrote: InfoZIP's unzip takes default parameters from the environment variable UNZIP. Unset it in the test library and use GIT_UNZIP for specifying alternate versions of the unzip command instead. t0024 wasn't even using variable for t

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

2013-01-07 Thread René Scharfe
Am 07.01.2013 09:45, schrieb Jonathan Nieder: René Scharfe wrote: --- a/t/t0024-crlf-archive.sh +++ b/t/t0024-crlf-archive.sh @@ -5,6 +5,11 @@ test_description='respect crlf in git archive' . ./test-lib.sh GIT_UNZIP=${GIT_UNZIP:-unzip} +test_lazy_prereq UNZIP ' + "$GIT_UNZIP" -v >/de

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

2013-01-07 Thread René Scharfe
Am 07.01.2013 09:52, schrieb 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

Re: [PATCH 1/8] Use %B for Split Subject/Body

2013-01-07 Thread Junio C Hamano
"郑文辉(Techlive Zheng)" writes: > Though, this patch defintely should be merged, becuase no one expects > his commit message be altered durging the splitting process. Are you saying that after double-checking what was posted? It said something like this below, which does not look like 'definitel

Re: [PATCH v2] status: always report ignored tracked directories

2013-01-07 Thread Torsten Bögershausen
On 06.01.13 23:09, Antoine Pelisse wrote: [snip] > Signed-off-by: Antoine Pelisse > --- > dir.c | 9 +++-- > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/dir.c b/dir.c > index 9b80348..f836590 100644 > --- a/dir.c > +++ b/dir.c > @@ -672,7 +672,8 @@ static struct dir_entry

Re: [PATCH 1/4] test: Add target test-lint-shell-syntax

2013-01-07 Thread Torsten Bögershausen
On 03.01.13 01:08, Junio C Hamano wrote: > Junio C Hamano writes: > >> I would actually not add this to TEST_LINT by default, especially >> when "duplicates" and "executable" that are much simpler and less >> likely to hit false positives are not on by default. >> >> At least, a change to add thi

Re: [PATCH v2] status: always report ignored tracked directories

2013-01-07 Thread Junio C Hamano
Torsten Bögershausen writes: > The bad news: the patch does not apply. Huh, isn't this already queued as 22ccf86 (status: always report ignored tracked directories, 2013-01-06)? > The good news: t7061 passes on pu, > and dir.c seems to be changes as needed: > > commit 1f4e17c6c9833f17dc6bbf045f

[PATCH] Documentation on depth option in git clone.

2013-01-07 Thread Stefan Beller
--- Documentation/git-clone.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 7fefdb0..e76aa50 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -186,7 +186,8 @@ objects from the sou

Re: [PATCH 1/4] test: Add target test-lint-shell-syntax

2013-01-07 Thread Junio C Hamano
Torsten Bögershausen writes: > Sorry for late answer, but there is a problem (both linux and Mac OS X) :-( > $ make test-lint does not do shel syntax check, neither > $ make test-lint-shell-syntax In which directory? $ make -C t test-lint-shell-syntax ... passes silently ... $ ed t/

[PATCH] Documentation on depth option in git clone.

2013-01-07 Thread Stefan Beller
Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 7fefdb0..e76aa50 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -186,7

Re: [PATCH] refs: do not use cached refs in repack_without_ref

2013-01-07 Thread Martin Fick
...[Sorry about the previous HTML reposts] Jeff King wrote: >On Mon, Dec 31, 2012 at 03:30:53AM -0700, Martin Fick wrote: > >> The general approach is to setup a transaction and >> either commit or abort it. A transaction can be setup >> by renaming an appropriately setup directory to the >> "re

[PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Stefan Beller
Currently it is not possible to have a shallow depth of just 0, i.e. only one commit in that repository after cloning. The minimum number of commits is 2, caused by depth=1. I had no good idea how to add this behavior to git clone as the depth variable in git_transport_options struct (file transpo

Re: [PATCH v2] status: always report ignored tracked directories

2013-01-07 Thread Junio C Hamano
Antoine Pelisse writes: First, thanks for working on this. The explanation is a bit confusing, especially for people like me, as it does not make it clear that there are two kinds of "paths in the index". Files can be added to the index ("git add" and then shown via "ls-files") and these are wh

[PATCH] Prevent space after directories in tcsh completion

2013-01-07 Thread Marc Khouzam
If git-completion.bash returns a single directory as a completion, tcsh will automatically add a space after it, which is not what the user wants. This commit prevents tcsh from doing this. Also, a check is added to make sure the tcsh version used is recent enough to allow completion to work as e

Re: [PATCH] Remove the suggestion to use parsecvs, which is currently broken.

2013-01-07 Thread Junio C Hamano
Heiko Voigt writes: > Hi, > > On Fri, Dec 28, 2012 at 11:42:00PM -0500, Eric S. Raymond wrote: >> Heiko Voigt : >> > Maybe you could add that information to the parsecvs compile >> > instructions? I think just because it takes some effort to compile does >> > not justify to remove this useful poi

The tip of 'next' has been rewound.

2013-01-07 Thread Junio C Hamano
Just to let you contributors know, your next "git fetch" will notice that remotes/origin/next has been rewound. Two topics have been kicked back to 'pu', and the branch has been reordered somewhat. I'll start merging bugfix topics that have graduated to master since v1.8.1 to maint so that we can

Re: [PATCH v2] status: always report ignored tracked directories

2013-01-07 Thread Antoine Pelisse
> Here is my attempt... > > When enumerating paths that are ignored, paths the index knows > about are not included in the result. The "index knows about" > check is done by consulting the name hash, not the actual > contents of the index: > > - When core.ignorecase is false,

Re: [PATCH] Remove the suggestion to use parsecvs, which is currently broken.

2013-01-07 Thread Eric S. Raymond
Junio C Hamano : > In the longer term, if parsecvs is revived either by Eric or > somebody else, we will add the mention back to the documentation, > probably with an updated URL. I'm working on the revival right now. Repository generation is still broken, and likely to remain so until I can make

Re: [PATCH 01/10] list_lookup: create case and length search

2013-01-07 Thread Junio C Hamano
Junio C Hamano writes: > Antoine Pelisse writes: > >> Create a new function to look-up a string in a string_list, but: >> - add a new parameter to ignore case differences >> - add a length parameter to search for a substring >> >> The idea is to avoid several copies (lowering a string before s

[PATCH v2 00/10] reroll of ap/log-mailmap

2013-01-07 Thread Junio C Hamano
This is a reroll of the previous series Antoine posted on Saturday. A new patch "string-list: allow case-insensitive string list" teaches the string-list API that some string lists can be sorted case insensitively (actually, you can feed any custom two string comparison functions). The string_lis

[PATCH v2 02/10] Use split_ident_line to parse author and committer

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Currently blame.c::get_acline(), pretty.c::pp_user_info() and shortlog.c::insert_one_record() are parsing author name, email, time and tz themselves. Use ident.c::split_ident_line() for better code reuse. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano ---

[PATCH v2 01/10] string-list: allow case-insensitive string list

2013-01-07 Thread Junio C Hamano
Some string list needs to be searched case insensitively, and for that to work correctly, the string needs to be sorted case insensitively from the beginning. Allow a custom comparison function to be defined on a string list instance and use it throughout in place of strcmp(). Signed-off-by: Juni

[PATCH v2 03/10] mailmap: remove email copy and length limitation

2013-01-07 Thread Junio C Hamano
In map_user(), we have email pointer that points at the beginning of an e-mail address, but the buffer is not terminated with a NUL after the e-mail address. It typically has ">" after the address, and it could have even more if it comes from author/committer line in a commit object. Or it may no

[PATCH v2 06/10] pretty: use mailmap to display username and email

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Use the mailmap information to display the rewritten username and email address in all log commands. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano --- pretty.c | 58 +- 1 file changed, 37 insertions(+

[PATCH v2 07/10] log: add --use-mailmap option

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Add the --use-mailmap option to log commands. It allows to display names from mailmap file when displaying logs, whatever the format used. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 5 + builtin/log.c | 9

[PATCH v2 04/10] mailmap: simplify map_user() interface

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Simplify map_user(), mostly to avoid copies of string buffers. It also simplifies caller functions. map_user() directly receive pointers and length from the commit buffer as mail and name. If mapping of the user and mail can be done, the pointer is updated to a new location

[PATCH v2 05/10] mailmap: add mailmap structure to rev_info and pp

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Pass a mailmap from rev_info to pretty_print_context to so that the pretty printer can use rewritten name and email address when showing commits. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano --- commit.h | 1 + log-tree.c | 1 + revision.h | 1 + 3 file

[PATCH v2 10/10] log: add log.mailmap configuration option

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Teach "log.mailmap" configuration variable to turn "--use-mailmap" option on to "git log", "git show" and "git whatchanged". The "--no-use-mailmap" option from the command line can countermand the setting. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano ---

[PATCH v2 09/10] log: grep author/committer using mailmap

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse Currently you can use mailmap to display log authors and committers but you can't use the mailmap to find commits with mapped values. This commit allows you to run: git log --use-mailmap --author mapped_name_or_email git log --use-mailmap --committer mapped_name_or

[PATCH v2 08/10] test: add test for --use-mailmap option

2013-01-07 Thread Junio C Hamano
From: Antoine Pelisse The new option '--use-mailmap' can be used to make sure that mailmap file is used to convert name when running log commands. The test is simple and checks that the Author line is correctly replaced when running log. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Ha

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

2013-01-07 Thread Mark Levedahl
On 01/07/2013 02:29 AM, Junio C Hamano wrote: I do not have much stake in this personally, but IIRC, the (l)stat workaround was back then found to make Cygwin version from "unusably slow" to "slow but torelable", as our POSIX-y codebase assumes that lstat is fairly efficient, which Cygwin cannot

Re: git.wiki.kernel.org spam ...

2013-01-07 Thread  
On 4 January 2013 23:47, Theodore Ts'o wrote: > On Sat, Jan 05, 2013 at 12:27:12AM +0100, Johannes Schindelin wrote: >> I was. John Hawley trusted me when I asked for admin privileges to keep >> the spam at bay, but a very vocal voice on the mailing list tried to >> discredit my work, and in the

Re: [PATCH 1/4] test: Add target test-lint-shell-syntax

2013-01-07 Thread Torsten Bögershausen
On 07.01.13 19:07, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> Sorry for late answer, but there is a problem (both linux and Mac OS X) :-( >> $ make test-lint does not do shel syntax check, neither >> $ make test-lint-shell-syntax > > In which directory? > > $ make -C t test-l

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Jonathan Nieder
Stefan Beller wrote: > Currently it is not possible to have a shallow depth of > just 0, i.e. only one commit in that repository after cloning. > The minimum number of commits is 2, caused by depth=1. Sounds buggy. Would anything break if we were to make --depth=1 mean "1 deep, including the tip

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Junio C Hamano
Jonathan Nieder writes: > Stefan Beller wrote: > >> Currently it is not possible to have a shallow depth of >> just 0, i.e. only one commit in that repository after cloning. >> The minimum number of commits is 2, caused by depth=1. > > Sounds buggy. Would anything break if we were to make --dept

You have exceeded the email quota limit

2013-01-07 Thread Susan Ntete
You have exceeded the email quota limit of 450MB and you need to expand the e-mail quota before the next 48 hours.if you do not update your e-mail account in 2013, you must do it now. You can expand 1GB email quota limit, use the following web link: https://docs.google.com/spreadsheet/viewform?for

Re: [PATCH v2 00/10] reroll of ap/log-mailmap

2013-01-07 Thread Antoine Pelisse
On Tue, Jan 8, 2013 at 1:10 AM, Junio C Hamano wrote: > This is a reroll of the previous series Antoine posted on Saturday. Thanks a lot for the reroll Junio > A new patch "string-list: allow case-insensitive string list" > teaches the string-list API that some string lists can be sorted > case

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Duy Nguyen
On Tue, Jan 8, 2013 at 1:06 AM, Stefan Beller wrote: > Currently it is not possible to have a shallow depth of > just 0, i.e. only one commit in that repository after cloning. > The minimum number of commits is 2, caused by depth=1. > > I had no good idea how to add this behavior to git clone as >

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Junio C Hamano
Junio C Hamano writes: > Jonathan Nieder writes: > >> Stefan Beller wrote: >> >>> Currently it is not possible to have a shallow depth of >>> just 0, i.e. only one commit in that repository after cloning. >>> The minimum number of commits is 2, caused by depth=1. >> >> Sounds buggy. Would anyth

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Junio C Hamano
Duy Nguyen writes: > If we choose not to do the off-by-one topic Junio suggested elsewhere > in the same thread, I think this document patch should be turned into > code instead. Just reject --depth=0 with an explanation. Users who are > hit by this will be caught without the need to read through

Re: [PATCH] git clone depth of 0 not possible.

2013-01-07 Thread Duy Nguyen
On Tue, Jan 8, 2013 at 1:54 PM, Junio C Hamano wrote: >> Sounds buggy. Would anything break if we were to make --depth=1 mean >> "1 deep, including the tip commit"? > > As long as we do not change the meaning of the "shallow" count going > over the wire (i.e. the number we receive from the user w

Re: [PATCH v2 00/10] reroll of ap/log-mailmap

2013-01-07 Thread Junio C Hamano
Antoine Pelisse writes: > Have you been able to measure a speed increase due to less copies ? No. This topic was not strictly my itch, but I did the rewrite because I couldn't stand staring at that *_extended() function ;-) -- To unsubscribe from this list: send the line "unsubscribe git" in t