Re: [PATCH] cvsimport: strip all inappropriate tag strings

2012-09-05 Thread Alex Vandiver
On Tue, 2012-09-04 at 22:26 -0600, Ken Dreyer wrote: When importing CVS tags, strip all the inappropriate strings from the tag names as we translate them to git tag names. [snip] diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 8d41610..0dc598d 100755 --- a/git-cvsimport.perl +++

Renaming a remote is 'rename', but removing is 'rm'

2012-09-05 Thread Tomas Carnecky
A fella on IRC was confused by $subject. And it did bother me sometimes as well. If you don't use `git remote` often, it is confusing that the commands are named inconsistently. If I know that there is `git remote rm` then I kindof expect `git remote mv` to exist. Because I am used to rm/mv and

Re: [PATCH 5/7] t0000: verify that real_path() works correctly with absolute paths

2012-09-05 Thread Johannes Sixt
Am 9/4/2012 10:14, schrieb mhag...@alum.mit.edu: From: Michael Haggerty mhag...@alum.mit.edu There is currently a bug: if passed an absolute top-level path that doesn't exist (e.g., /foo) it incorrectly interprets the path as a relative path (e.g., returns $(pwd)/foo). So mark the test as

Re: [PATCH 7/7] t0000: verify that real_path() removes extra slashes

2012-09-05 Thread Johannes Sixt
Am 9/4/2012 10:14, schrieb mhag...@alum.mit.edu: From: Michael Haggerty mhag...@alum.mit.edu These tests already pass, but make sure they don't break in the future. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- It would be great if somebody would check whether these tests

Re: Renaming a remote is 'rename', but removing is 'rm'

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 2:59 PM, Tomas Carnecky tomas.carne...@gmail.com wrote: A fella on IRC was confused by $subject. And it did bother me sometimes as well. If you don't use `git remote` often, it is confusing that the commands are named inconsistently. If I know that there is `git remote

Does or could git handle file licensing information?

2012-09-05 Thread Yohann Ferreira
Hi everyone, I don't know whether this question has already been raised, but everything is in the title. As a day-to-day hard git user ;), I also have to manage files with different licenses I need to track. As git handles all those files in a very smart way, I wondered whether git could also

Re: Does or could git handle file licensing information?

2012-09-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Sep 5, 2012 at 12:51 PM, Yohann Ferreira yohann.ferre...@orange.fr wrote: As a day-to-day hard git user ;), I also have to manage files with different licenses I need to track. As git handles all those files in a very smart way, I wondered whether git could also handle that

RE: [PATCH 1/2] Support for setitimer() on platforms lacking it

2012-09-05 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Wednesday, September 05, 2012 12:45 AM To: Joachim Schmitz Cc: git@vger.kernel.org; 'Johannes Sixt' Subject: Re: [PATCH 1/2] Support for setitimer() on platforms lacking it Joachim Schmitz j...@schmitz-digital.de writes: From: Junio

Re: [PATCH 9/9] Add git-check-ignores

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 12:26 AM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: +static void output_exclude(const char *path, struct exclude *exclude) +{ + char *type = exclude-to_exclude ? excluded : included; + char *bang =

Re: [PATCH 5/9] Refactor excluded and path_excluded

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 12:23 AM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sun, Sep 2, 2012 at 7:12 AM, Adam Spiers g...@adamspiers.org wrote: extern void path_exclude_check_init(struct path_exclude_check *, struct dir_struct *); extern void

Re: [PATCH 7/7] t0000: verify that real_path() removes extra slashes

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 1:19 AM, Junio C Hamano gits...@pobox.com wrote: mhag...@alum.mit.edu writes: From: Michael Haggerty mhag...@alum.mit.edu These tests already pass, but make sure they don't break in the future. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- It would be

Re: [RFC] i18n.pathencoding

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sat, Sep 1, 2012 at 1:11 PM, Torsten Bögershausen tbo...@web.de wrote: @@ -476,7 +476,7 @@ int parse_options(int argc, const char **argv, const char *prefix,

Re: Renaming a remote is 'rename', but removing is 'rm'

2012-09-05 Thread Matthieu Moy
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: Looking at the remote command list, rm is the only abbreviation. I guess we should add delete (or remove) as an alias for rm. I'd vote for remove, to make it clear that rm is the abbreviation. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ --

Re: [PATCH 7/7] t0000: verify that real_path() removes extra slashes

2012-09-05 Thread Nguyen Thai Ngoc Duy
On Wed, Sep 5, 2012 at 6:05 PM, Orgad and Raizel Shaneh org...@gmail.com wrote: This seems to fix it. Just change src[x] == '/' to is_dir_sep(src[x]). So you are able to test the changes. Would you mind submitting a patch so other users benefit it as well? -- Duy -- To unsubscribe from this

RE: poll() emulation in git

2012-09-05 Thread Joachim Schmitz
From: Joachim Schmitz [mailto:j...@schmitz-digital.de] Sent: Tuesday, September 04, 2012 1:49 PM To: 'Junio C Hamano' Cc: 'git@vger.kernel.org'; 'Erik Faye-Lund' Subject: RE: [PATCH v2] Support non-WIN32 system lacking poll() while keeping the WIN32 part intact From: Junio C Hamano

[PATCH] Fix path normalization for SMB shares

2012-09-05 Thread Orgad Shaneh
SMB shared are accessed using //server/share/directory... notation. normalize_path_copy used to leave only a single slash, which invalidated the path. Fix suggested by Nguyen Thai Ngoc Duy Signed-off-by: Orgad Shaneh org...@gmail.com --- path.c |6 ++ 1 file changed, 6 insertions(+)

Re: [PATCH] git-submodule: respect -q for add/update

2012-09-05 Thread Orgad and Raizel Shaneh
On Tue, Sep 4, 2012 at 6:28 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 04.09.2012 09:31, schrieb Orgad Shaneh: Signed-off-by: Orgad Shaneh org...@gmail.com Before the Signed-off-by is the place where you should have explained why this would be a worthwhile change ;-) To me this looks

[RFC/PATCH] blame: simplify algorithm

2012-09-05 Thread Michael J Gruber
Recent research (http://tirania.org/blog/archive/2012/Aug-29.html) resulted in a simplified algorithm for assigning blame in foss projects. Make git blame use that algorithm by default. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I've updated the man page for 'git annotate' but

Re: poll() emulation in git

2012-09-05 Thread Paolo Bonzini
Il 05/09/2012 13:24, Joachim Schmitz ha scritto: However: this poll implementation, while compiling OK, doesn't work properly. Because it uses recv(...,MSG_PEEK), it works on sockets only (returns ENOTSOCK on anything else), while the real poll() works on all kind if file descriptors, at

RE: poll() emulation in git

2012-09-05 Thread Joachim Schmitz
From: Paolo Bonzini [mailto:paolo.bonz...@gmail.com] On Behalf Of Paolo Bonzini Sent: Wednesday, September 05, 2012 2:05 PM To: Joachim Schmitz Cc: 'Junio C Hamano'; git@vger.kernel.org; 'Erik Faye-Lund'; bug-gnu...@gnu.org Subject: Re: poll() emulation in git Il 05/09/2012 13:24,

RE: poll() emulation in git

2012-09-05 Thread Joachim Schmitz
From: Joachim Schmitz [mailto:j...@schmitz-digital.de] Sent: Wednesday, September 05, 2012 2:58 PM To: 'Paolo Bonzini' Cc: 'Junio C Hamano'; 'git@vger.kernel.org'; 'Erik Faye-Lund'; 'bug-gnu...@gnu.org' Subject: RE: poll() emulation in git From: Paolo Bonzini

[PATCH 0/3] pre-merge-hook

2012-09-05 Thread Michael J Gruber
The pre-commit hook is often used to ensure certain properties of each comitted tree like formatting or coding standards, validity (lint/make) or code quality (make test). But merges introduce new commits unless they are fast forwards, and therefore they can break these properties because the

[PATCH 1/3] git-merge: Honor pre-merge hook

2012-09-05 Thread Michael J Gruber
git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called for an automatic merge commit just like pre-commit is called for a non-automatic merge commit (or any other commit).

[PATCH 2/3] merge: --no-verify to bypass pre-merge hook

2012-09-05 Thread Michael J Gruber
Analogous to commit, introduce a '--no-verify' option which bypasses the pre-merge hook. The shorthand '-n' is taken by the (non-existing) '--no-stat' already. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-merge.txt | 2 +- Documentation/githooks.txt |

[PATCH 3/3] t7503: add tests for pre-merge-hook

2012-09-05 Thread Michael J Gruber
Add tests which make sure that the pre-merge-hook is called when present, allows/disallows merge commits depending on its return value and is suppressed by --no-verify. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7503-pre-commit-hook.sh | 66

[PATCH 0/2] Add --expand to 'git notes get-ref'

2012-09-05 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us I was recently confused when $ git notes merge -v refs/remotes/origin/notes/commits failed to do (or print) anything. It turns out that note refs must live under 'refs/notes/', so my command line ref was expanding to

[PATCH 1/2] notes get-ref: --expand expands the output notes ref.

2012-09-05 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us Useful for debugging refs that don't seem to be expanding correctly. Signed-off-by: W. Trevor King wk...@tremily.us --- Documentation/git-notes.txt | 6 +- builtin/notes.c | 26 +- t/t3301-notes.sh| 8

[PATCH 2/2] notes: don't alter refs starting with 'refs/' in expand_notes_ref

2012-09-05 Thread W. Trevor King
From: W. Trevor King wk...@tremily.us This avoids surprising cases like: $ GIT_NOTES_REF=refs/remotes/origin/notes/commits git notes get-ref --expand refs/notes/refs/remotes/origin/notes/commits With the old implementation, all note refs had to live under 'refs/notes/' which was not

Re: poll() emulation in git

2012-09-05 Thread Paolo Bonzini
Il 05/09/2012 15:36, Joachim Schmitz ha scritto: Does your system have a working FIONREAD ioctl for pipes? It does have FIONREAD ioctl. Whether it works properly is to be determined... I'll test if you could show me how? Oh, now I see what you aimed at, but no, that Mac OS X method

Re: [PATCH 1/3] git-merge: Honor pre-merge hook

2012-09-05 Thread Michael Haggerty
On 09/05/2012 03:39 PM, Michael J Gruber wrote: git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called for an automatic merge commit just like pre-commit is called for a

Re: [PATCH 0/2] Add --expand to 'git notes get-ref'

2012-09-05 Thread Johan Herland
On Wed, Sep 5, 2012 at 2:48 PM, W. Trevor King wk...@tremily.us wrote: The second commit makes the expansion less strict about the location of note refs. In his initial mail introducing 'git notes', Johan says that note refs should live under 'refs/notes' [1]. This seems like a good place

Re: [PATCH 1/2] notes get-ref: --expand expands the output notes ref.

2012-09-05 Thread Johan Herland
On Wed, Sep 5, 2012 at 2:52 PM, W. Trevor King wk...@tremily.us wrote: From: W. Trevor King wk...@tremily.us Useful for debugging refs that don't seem to be expanding correctly. Signed-off-by: W. Trevor King wk...@tremily.us Acked-by: Johan Herland jo...@herland.net -- Johan Herland,

[PATCH/RFC] l10n: de.po: translate 2 new messages

2012-09-05 Thread Ralf Thielow
Translate 2 new messages came from git.pot update in ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Hi German l10n team, please review this small update on German translation. This patch here is based on a preparation commit

git-svn: memoize cmt_metadata

2012-09-05 Thread Lalit Chhabra
Hi, I have about 150 branches = ... and tags = ... lines in my .git/config file, and I see a 30x improvement in 'git svn rebase -l' when I memoize the cmt_metadata function. (The run time goes down from ~150 seconds to ~5 seconds on my machine). I see that it was memoized in version: *

Re: [PATCH 0/2] Add --expand to 'git notes get-ref'

2012-09-05 Thread W. Trevor King
On Wed, Sep 05, 2012 at 05:58:37PM +0200, Johan Herland wrote: On Wed, Sep 5, 2012 at 2:48 PM, W. Trevor King wk...@tremily.us wrote: If I'm missing a good reason to keep everything under 'refs/notes/', feel free to ignore the second patch. This has been discussed a couple of times on this

Re: [PATCH] send-email: validate reconfirm interactive responses

2012-09-05 Thread Stephen Boyd
On Tue, Aug 14, 2012 at 3:25 PM, Junio C Hamano gits...@pobox.com wrote: @@ -745,13 +752,15 @@ sub file_declares_8bit_cte { if (!defined $sender) { $sender = $repoauthor || $repocommitter || ''; $sender = ask(Who should the emails appear to be from? [$sender] , -

Re: [PATCH v2] fetch: align new ref summary printout in UTF-8 locales

2012-09-05 Thread Torsten Bögershausen
On 09/05/2012 08:15 PM, Torsten Bögershausen wrote: On 04.09.12 12:39, Nguyễn Thái Ngọc Duy wrote: +/* return the number of columns of string 's' in current locale */ +int gettext_width(const char *s) +{ + static int is_utf8 = -1; + if (is_utf8 == -1) + is_utf8 =

Re: git archive --format zip utf-8 issues

2012-09-05 Thread René Scharfe
Am 04.09.2012 23:03, schrieb Junio C Hamano: René Scharfe rene.scha...@lsrfire.ath.cx writes: + if (has_non_ascii(path)) { Do we want to treat \033 as ascii in this codepath? The function primarily is used by the log formatter to see if we need 8-bit CTE when writing out in the e-mail

Re: Odd issue - The Diffs That WILL NOT DIE.

2012-09-05 Thread Robin Rosenberg
Jeff King skrev 2011-12-08 00.06: On Wed, Dec 07, 2011 at 11:58:27PM +0100, Carlos Martín Nieto wrote: If you want to use OSX to develop this project, you'll have to either rename one of those files or set your filesystem to be case-sensitive (and unset core.ignorecase afterwards). From what

Re: [RFC] i18n.pathencoding

2012-09-05 Thread Torsten Bögershausen
On 05.09.12 13:11, Nguyen Thai Ngoc Duy wrote: On Wed, Sep 5, 2012 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sat, Sep 1, 2012 at 1:11 PM, Torsten Bögershausen tbo...@web.de wrote: @@ -476,7 +476,7 @@ int parse_options(int argc, const

Re: [RFC] i18n.pathencoding

2012-09-05 Thread Torsten Bögershausen
On 04.09.12 22:12, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: This leads to 2 questions: a) Do we want the reencode feature in git, so that I continue to work on it? From a performance point of view that would probably OK: The git status on a linux tree was

Re: [PATCH] git-submodule: respect -q for add/update

2012-09-05 Thread Jens Lehmann
Am 05.09.2012 13:42, schrieb Orgad and Raizel Shaneh: On Tue, Sep 4, 2012 at 6:28 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 04.09.2012 09:31, schrieb Orgad Shaneh: Signed-off-by: Orgad Shaneh org...@gmail.com Before the Signed-off-by is the place where you should have explained why

git-repack.sh not server/multiuse safe?

2012-09-05 Thread Martin Fick
I have been reading the git-repack.sh script and I have found a piece that I am concerned with. It looks like after repacking there is a place when packfiles could be temporarily unaccessible making the objects within temporarily unaccessible. If my evaluation is true, it would seem like

[PATCHv2] fetch --all: pass --tags/--no-tags through to each remote

2012-09-05 Thread Dan Johnson
When fetch is invoked with --all, we need to pass the tag-following preference to each individual fetch; without this, we will always auto-follow tags, preventing us from fetching the remote tags into a remote-specific namespace, for example. Reported-by: Oswald Buddenhagen o...@kde.org

[PATCH] cvsimport: strip all inappropriate tag strings

2012-09-05 Thread Ken Dreyer
Certain characters such as ? can be present in a CVS tag name, but git does not allow these characters in tags. If git-cvsimport encounters a CVS tag that git cannot handle, cvsimport will error and refuse to continue the import beyond that point. When importing CVS tags, strip all the

Re: [PATCH 0/2] Add --expand to 'git notes get-ref'

2012-09-05 Thread Johan Herland
On Wed, Sep 5, 2012 at 7:53 PM, W. Trevor King wk...@tremily.us wrote: On Wed, Sep 05, 2012 at 05:58:37PM +0200, Johan Herland wrote: On Wed, Sep 5, 2012 at 2:48 PM, W. Trevor King wk...@tremily.us wrote: If I'm missing a good reason to keep everything under 'refs/notes/', feel free to

Re: stash -u deletes ignored files

2012-09-05 Thread Richard Browne
We have been bitten by this bug too. git stash -u is deleting ignored files. There seems to a bug in git stash. Subfolders with ignored files are deleted if the subfolders themselves are not ignored. How to reproduce. --- mkdir TestRepo cd TestRepo mkdir Ignored echo

Encrypted repositories

2012-09-05 Thread Enrico Weigelt
Hi, I'm currently planning to implement an strong encryption in git (not like gitcrypt, but with encrypted blobs, directories, etc, directly in the core). The idea goes like this: * blobs are encrypted with their (original) content hash as encryption keys * directory objects only hold

splitted directory objects

2012-09-05 Thread Enrico Weigelt
Hi folks, IIRC some people were working on splitted directory objects (eg. for putting subdirs into their own objects), some time ago. What's the current status of this ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development

Re: [PATCH 5/9] Refactor excluded and path_excluded

2012-09-05 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: We could introduce exclude_path() and kill path_excluded() then. There are just about 5-6 call sites to replace. The name path_excluded(... path ...) sounds like it is asking a yes/no question is this path excluded?, which actually is what is

Re: [PATCH 7/7] t0000: verify that real_path() removes extra slashes

2012-09-05 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: diff --git a/path.c b/path.c index 66acd24..ad2881c 100644 --- a/path.c +++ b/path.c @@ -503,6 +503,10 @@ int normalize_path_copy(char *dst, const char *src) *dst++ = *src++; *dst++ = *src++; } +#ifdef

Re: [RFC] i18n.pathencoding

2012-09-05 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 05.09.12 13:11, Nguyen Thai Ngoc Duy wrote: On Wed, Sep 5, 2012 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sat, Sep 1, 2012 at 1:11 PM, Torsten Bögershausen tbo...@web.de wrote: @@

Re: [PATCH] send-email: validate reconfirm interactive responses

2012-09-05 Thread Junio C Hamano
Stephen Boyd bebar...@gmail.com writes: On Tue, Aug 14, 2012 at 3:25 PM, Junio C Hamano gits...@pobox.com wrote: @@ -745,13 +752,15 @@ sub file_declares_8bit_cte { if (!defined $sender) { $sender = $repoauthor || $repocommitter || ''; $sender = ask(Who should the emails

Re: [PATCH] cherry-pick: Append -x line on separate paragraph

2012-09-05 Thread Junio C Hamano
Robin Stocker ro...@nibor.org writes: Junio C Hamano writes: Robin Stocker ro...@nibor.org writes: if (opts-record_origin) { + /* Some implementations don't terminate message with final \n, so add it */ + if (msg.message[strlen(msg.message)-1] != '\n') +

Re: [PATCH] cvsimport: strip all inappropriate tag strings

2012-09-05 Thread Junio C Hamano
Ken Dreyer ktdre...@ktdreyer.com writes: Certain characters such as ? can be present in a CVS tag name, but git does not allow these characters in tags. If git-cvsimport encounters a CVS tag that git cannot handle, cvsimport will error and refuse to continue the import beyond that point.

Re: Renaming a remote is 'rename', but removing is 'rm'

2012-09-05 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: Looking at the remote command list, rm is the only abbreviation. I guess we should add delete (or remove) as an alias for rm. I'd vote for remove, to make it clear that rm is the abbreviation.

Re: [PATCH 0/3] pre-merge-hook

2012-09-05 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: The pre-commit hook is often used to ensure certain properties of each comitted tree like formatting or coding standards, validity (lint/make) or code quality (make test). But merges introduce new commits unless they are fast forwards, and

Re: [PATCH 1/2] notes get-ref: --expand expands the output notes ref.

2012-09-05 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: On Wed, Sep 5, 2012 at 2:52 PM, W. Trevor King wk...@tremily.us wrote: From: W. Trevor King wk...@tremily.us Useful for debugging refs that don't seem to be expanding correctly. Signed-off-by: W. Trevor King wk...@tremily.us Acked-by: Johan Herland

Re: splitted directory objects

2012-09-05 Thread Junio C Hamano
Enrico Weigelt enrico.weig...@vnc.biz writes: IIRC some people were working on splitted directory objects (eg. for putting subdirs into their own objects), some time ago. Each directory maps to its own tree object, so a subdirectory is stored in its own object. It happened on April 7th, 2005,

Re: Encrypted repositories

2012-09-05 Thread Junio C Hamano
Enrico Weigelt enrico.weig...@vnc.biz writes: * blobs are encrypted with their (original) content hash as encryption keys What does this even mean? Is it expected that anybody who has access to the repository can learn names of objects (e.g. by running ls .git/objects/??/)? If so, from whom

[PATCH] cvsimport: strip all inappropriate tag strings

2012-09-05 Thread Ken Dreyer
Certain characters such as ? can be present in a CVS tag name, but git does not allow these characters in tags. If git-cvsimport encounters a CVS tag that git cannot handle, cvsimport will error and refuse to continue the import beyond that point. When importing CVS tags, strip all the