Git 1.8.2 l10n round 2

2013-02-13 Thread Jiang Xin
Hi, Leaders of Git language teams please note that a new "git.pot" is generated from v1.8.1.3-568-g5bf72 in the master branch. See commit: l10n: Update git.pot (35 new, 14 removed messages) L10n for git 1.8.2 round 2: Generate po/git.pot from v1.8.1.3-568-g5bf72. Signed-off-by: Jian

Re: [PATCH] Documentation: filter-branch env-filter example

2013-02-13 Thread Johannes Sixt
Am 2/13/2013 20:47, schrieb Tade: > filter-branch --env-filter example that shows how to change the email address > in all commits by a certain developer. > --- You should sign off your patch. Use a full real name, please. > Documentation/git-filter-branch.txt | 13 + > 1 file change

Re: Very Urgent.

2013-02-13 Thread ROY PADAYACHY
EASY LOAN. esp.ce.gov.br> writes: > > > Hello, do you know that you can now get the LOAN you deserve without the fear of been denied by any one? We are > currently offering Personal and Business Loan at 2% interest rate per annual. For urgent attention > E-mail: kdf.ls001 xyan.us > > --

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-13 Thread Andrew Ardill
On 14 February 2013 15:36, Junio C Hamano wrote: >> That is, currently git add defaults to not staging file deletions, and >> we provide command line flags to include them. The consensus in the >> thread is that it is better to stage them by default; it seems >> reasonable to me that if we stage d

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-13 Thread Junio C Hamano
Andrew Ardill writes: >> We've discussed that before. >> >> http://thread.gmane.org/gmane.comp.version-control.git/171811/focus=171818 > > Something that I couldn't find discussed was the option of, rather > than providing a config to 'turn it off', inverting the current > default/flags combo. >

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-13 Thread Andrew Ardill
On 14 February 2013 02:27, Junio C Hamano wrote: >> If we need to support this behaviour than I would suppose a config >> option is required. A default config transition path similar to git >> push defaults would probably work well, in the case where breaking >> these expectations is unacceptable.

Re: inotify to minimize stat() calls

2013-02-13 Thread Karsten Blees
Am 13.02.2013 23:55, schrieb Jeff King: > On Wed, Feb 13, 2013 at 09:25:59PM +0100, Karsten Blees wrote: > >> Alternatively, we could simply create normal cache_entries for the >> directories that are linked via ce->next, but have a trailing '/' in >> their name? >> >> Reference counting sounds go

[BUG] Veryfing signatures in git log fails when language is not english

2013-02-13 Thread XANi
Hi, any functionality that depends on exact exit msg of program can potentially fail because of that ᛯ export |grep LANG declare -x LANG="pl_PL.UTF-8" ᛯ ~/src/os/git/git log --format="%G? %h" |head -2 0d19377 5b9d7f8 ᛯ unset LANG ᛯ ~/src/os/git/git log --format="%G? %h" |head -2 G 0d19377 G

Re: Cumulative "git read-tree -m" rejected with overwriting warning

2013-02-13 Thread Junio C Hamano
Marcin Owsiany writes: > "the index file saves and restores with all this information, so you > can merge things incrementally," > > which I took to mean that I can read from multiple trees one by one > before writing the tree. That "incrementally" refers to "after a three-way merge stops with

Cumulative "git read-tree -m" rejected with overwriting warning

2013-02-13 Thread Marcin Owsiany
Hello, Consider the following use case: git init seq 0 9 > f git add f git commit -m start git checkout -b b1 perl -pi -e 's,0,b1,' f git commit -a -m b1 git checkout -b b2 perl -pi -e 's,9,b2,' f git commit -a -m b2 git checkout master git merge b1 b1 As the cha

Re: inotify to minimize stat() calls

2013-02-13 Thread Jeff King
On Wed, Feb 13, 2013 at 09:25:59PM +0100, Karsten Blees wrote: > Am 13.02.2013 19:18, schrieb Jeff King: > > Moreover, looking at it again, I > > don't think my patch produces the right behavior: we have a single > > dir_next pointer, even though the same ce_entry may appear under many > > directo

Re: [RFC v2] git-multimail: a replacement for post-receive-email

2013-02-13 Thread Michael Haggerty
On 02/13/2013 03:56 PM, Matthieu Moy wrote: > Michael Haggerty writes: > >> A while ago, I submitted an RFC for adding a new email notification >> script to "contrib" [1]. The reaction seemed favorable and it was >> suggested that the new script should replace post-receive-email rather >> than b

[PATCH v3 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Martin Erik Werner
Add 3 extra tests for the bash.showDirtyState config option, the test now cover all combinations of the shell var being set/unset and the config option being missing/enabled/disabled, given a dirty file. * Renamed test 'disabled by config' to 'shell variable set with config disabled' for consist

[PATCH v3 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Martin Erik Werner
Add 4 test for the bash.showUntrackedFiles config option, the tests now cover all combinations of the shell var being set/unset and the config option being missing/enabled/disabled. Signed-off-by: Martin Erik Werner --- t/t9903-bash-prompt.sh | 40 1 fi

Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: >> OK, I'll locally amend the patch. Thanks. > > Ok, so I shouldn't reroll them with s/unset -v/sane_unset/ and reworded > commits + sign-off then, I can if you prefer that? You can if you wanted to. That would be less work for me ;-). -- To unsubscribe from this lis

Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Martin Erik Werner
On Wed, 2013-02-13 at 11:53 -0800, Junio C Hamano wrote: > Martin Erik Werner writes: > > >> Strictly speaking, you have 6 not 4 combinations (shell variable > >> set/unset * config missing/set to false/set to true). I think these > >> additional tests cover should all 6 because "config missing"

Re: inotify to minimize stat() calls

2013-02-13 Thread Karsten Blees
Am 13.02.2013 19:18, schrieb Jeff King: > Moreover, looking at it again, I > don't think my patch produces the right behavior: we have a single > dir_next pointer, even though the same ce_entry may appear under many > directory hashes. So the cache_entries that has to "dir/foo/" and those > that ha

[PATCH] Documentation: filter-branch env-filter example

2013-02-13 Thread Tade
filter-branch --env-filter example that shows how to change the email address in all commits by a certain developer. --- Documentation/git-filter-branch.txt | 13 + 1 file changed, 13 insertions(+) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.tx

Re: [PATCH] Makefile: don't run rm without any files

2013-02-13 Thread Jonathan Nieder
Junio C Hamano wrote: > I amended the log message like so: > > commit bd9df384b16077337fffe9836c9255976b0e7b91 > Author: Matt Kraai > Date: Wed Feb 13 07:57:48 2013 -0800 > > Makefile: don't run rm without any files > > When COMPUTE_HEADER_DEPENDENCIES is set to "auto" and the compiler

Re: [PATCH] Makefile: don't run rm without any files

2013-02-13 Thread Junio C Hamano
Matt Kraai writes: > I don't set COMPUTE_HEADER_DEPENDENCIES, so it defaults to "auto". > The automatic detection determines that the compiler doesn't support > it, so it's then set to "no". CHECK_HEADER_DEPENDENCIES isn't set > either, so about 20 lines below the dep_dirs assignment you quoted,

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-13 Thread Junio C Hamano
Jens Lehmann writes: > Junio, this looks like a we have v5 as soon as we decide what to do > with the "not initialized" messages when '.' is used, right? OK. I myself do not deeply care if we end up special casing "." or not; I'll leave it up to you and other submodule folks. Thanks. -- To uns

Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: >> Strictly speaking, you have 6 not 4 combinations (shell variable >> set/unset * config missing/set to false/set to true). I think these >> additional tests cover should all 6 because "config missing" case >> should already have had tests before bash.showDirtyState w

Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: > So would it make sense to do: > GIT_PS1_SHOWUNTRACKEDFILES="dummy" && > unset GIT_PS1_SHOWUNTRACKEDFILES && > (...) > instead then? I think we have sane_unset exactly for this reason. -- To unsubscribe from this list: send the line "unsubscribe git"

Re: inotify to minimize stat() calls

2013-02-13 Thread Jeff King
On Wed, Feb 13, 2013 at 01:18:51PM -0500, Jeff King wrote: > I think the best way forward is to actually create a separate hash table > for the directory lookups. I note that we only care about these entries > in directory_exists_in_index_icase, which is really about whether > something is there,

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-13 Thread Jens Lehmann
Am 12.02.2013 18:11, schrieb Phil Hord: > On Wed, Feb 6, 2013 at 4:11 PM, Jens Lehmann wrote: > + die_if_unmatched "$mode" >> + name=$(module_name "$sm_path") || exit >> + url=$(git config submodule."$name".url) >> + if test -z "$url" >> +

Re: inotify to minimize stat() calls

2013-02-13 Thread Jeff King
On Wed, Feb 13, 2013 at 07:15:47PM +0700, Nguyen Thai Ngoc Duy wrote: > On Wed, Feb 13, 2013 at 3:48 AM, Karsten Blees > wrote: > > 2.) 0.135 s is spent in name-hash.c/hash_index_entry_directories, > > reindexing the same directories over and over again. In the end, the > > hashtable contains

Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Martin Erik Werner
On Wed, 2013-02-13 at 08:28 -0800, Junio C Hamano wrote: > Martin Erik Werner writes: > > > Added 3 extra tests for the bash.showDirtyState config option, tests > > should now cover all combinations of the shell var being set/unset and > > the config option being enabled/disabled, given a dirty f

Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Martin Erik Werner
On Wed, 2013-02-13 at 08:23 -0800, Junio C Hamano wrote: > Martin Erik Werner writes: > > > Add 4 test for the bash.showUntrackedFiles config option, covering all > > combinations of the shell var being set/unset and the config option > > being enabled/disabled. > > > > Signed-off-by: Martin Erik

Re: [PATCH] Makefile: don't run rm without any files

2013-02-13 Thread Matt Kraai
On Wed, Feb 13, 2013 at 08:51:45AM -0800, Junio C Hamano wrote: > Matt Kraai writes: > > > From: Matt Kraai > > > > "rm -f -r" fails on QNX when not passed any files to remove. > > I do not think it is limited to QNX. > > > the clean target, since dep_dirs is empty. > > And dep_dirs being emp

Re: [PATCH v4 3/4] count-objects: report garbage files in pack directory too

2013-02-13 Thread Junio C Hamano
Junio C Hamano writes: >> +if (has_extension(de->d_name, ".idx") || >> +has_extension(de->d_name, ".pack") || >> +has_extension(de->d_name, ".keep")) >> +string_list_append(&garbage, path); > > It might be OK to put .pack and .keep i

Re: [PATCH] Makefile: don't run rm without any files

2013-02-13 Thread Junio C Hamano
Matt Kraai writes: > From: Matt Kraai > > "rm -f -r" fails on QNX when not passed any files to remove. I do not think it is limited to QNX. > the clean target, since dep_dirs is empty. And dep_dirs being empty under some circumstance shouldn't be limited to QNX, either. I think your change d

Re: [PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: > Added 3 extra tests for the bash.showDirtyState config option, tests > should now cover all combinations of the shell var being set/unset and > the config option being enabled/disabled, given a dirty file. Strictly speaking, you have 6 not 4 combinations (shell varia

Re: [PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: > Add 4 test for the bash.showUntrackedFiles config option, covering all > combinations of the shell var being set/unset and the config option > being enabled/disabled. > > Signed-off-by: Martin Erik Werner > --- > t/t9903-bash-prompt.sh | 40 +++

Re: [RFC v2] git-multimail: a replacement for post-receive-email

2013-02-13 Thread Matthieu Moy
Andy Parkins writes: > On Wednesday 13 February 2013 14:56:25 Matthieu Moy wrote: >> Michael Haggerty writes: > >> I think adding a short "dependencies" section in the README (or in an >> INSTALL file) saying which Python version works could save new users the >> trouble (I see the sheebang insi

Re: [PATCH v2 1/3] shell prompt: add bash.showUntrackedFiles option

2013-02-13 Thread Junio C Hamano
Martin Erik Werner writes: > Add a config option 'bash.showUntrackedFiles' which allows enabling > the prompt showing untracked files on a per-repository basis. This is > useful for some repositories where the 'git ls-files ...' command may > take a long time. > > Signed-off-by: Martin Erik Werne

[PATCH] Makefile: don't run rm without any files

2013-02-13 Thread Matt Kraai
From: Matt Kraai "rm -f -r" fails on QNX when not passed any files to remove. This breaks the clean target, since dep_dirs is empty. Avoid this by merging two rm command lines. Signed-off-by: Matt Kraai --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefi

Re: [PATCH v4 3/4] count-objects: report garbage files in pack directory too

2013-02-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > prepare_packed_git_one() is modified to allow count-objects to hook a > report function to so we don't need to duplicate the pack searching > logic in count-objects.c. When report_pack_garbage is NULL, the > overhead is insignificant. > > The garbage is reported wi

Re: Git-aware HTTP transport docs

2013-02-13 Thread Junio C Hamano
Scott Chacon writes: > I don't believe it was ever merged into the Git docs. I have a copy of it > here: > > https://www.dropbox.com/s/pwawp8kmwgyc3w2/http-protocol.txt Thanks for a pointer. It seems that it wasn't in a shape ready to be "merged" yet. Does somebody want to pick it up and pol

Re: What's cooking in git.git (Feb 2013, #05; Tue, 12)

2013-02-13 Thread Junio C Hamano
Andrew Ardill writes: > On 13 February 2013 11:34, Junio C Hamano wrote: >> The change could negatively affect people who expect that removing >> files that are not used for their purpose (e.g. a large file that is >> unnecessary for their build) will _not_ affect what they get from >> "git add

Re: [RFC v2] git-multimail: a replacement for post-receive-email

2013-02-13 Thread Andy Parkins
On Wednesday 13 February 2013 14:56:25 Matthieu Moy wrote: > Michael Haggerty writes: > I think adding a short "dependencies" section in the README (or in an > INSTALL file) saying which Python version works could save new users the > trouble (I see the sheebang inside the scripts says python2 bu

Re: [RFC v2] git-multimail: a replacement for post-receive-email

2013-02-13 Thread Matthieu Moy
Michael Haggerty writes: > A while ago, I submitted an RFC for adding a new email notification > script to "contrib" [1]. The reaction seemed favorable and it was > suggested that the new script should replace post-receive-email rather > than be added separately, ideally with some kind of migrat

[ANN] First beta: Git export with hardlinks

2013-02-13 Thread Thomas Koch
Hi, my git_export_hardlink command should now be in a usable state. I'd appreciate any feedback: https://github.com/thkoch2001/git_export_hardlinks I still have to choose a license: BSD/GPL/? Jeff King: > It looks like you create the sha1->path mapping by asking the user to > provide , pairs,

Re: git svn init throws Not a git repository (or any of the parent directories): .git

2013-02-13 Thread Konstantin Khomoutov
On Wed, 13 Feb 2013 14:01:36 +0100 "amccl...@gmail.com" wrote: > I have problem with git svn init: > When I execute > git svn init svn+ssh://usern...@example.com/path/repo > I see: > fatal: Not a git repository (or any of the parent directories): .git > Already at toplevel, but .git not found >

Re: A good Git technique for referring back to original files

2013-02-13 Thread MikeW
MikeW yahoo.co.uk> writes: > > Paul Campbell kemitix.net> writes: > > > > > Hi Mike, > > > > I think git-cvsimport and git-subtree could help you here. > > > > That looks very interesting, had not considered git subtree and it looks like > the right kind of method. > > Thanks. > Mike The

Re: [git-multimail] License unknown (#1)

2013-02-13 Thread Michael Haggerty
On 02/12/2013 04:28 PM, Andy Parkins wrote: > On Sunday 27 January 2013 18:52:58 Michael Haggerty wrote: >> I have a question about the license of contrib/hooks/post-commit-email. >> [...] > > Keeping up with the git mailing list got a bit much, [...] Very understandable :-) > My apologies to ev

Re: A good Git technique for referring back to original files

2013-02-13 Thread MikeW
Paul Campbell kemitix.net> writes: > > Hi Mike, > > I think git-cvsimport and git-subtree could help you here. > That looks very interesting, had not considered git subtree and it looks like the right kind of method. Thanks. Mike > Hope that helps. > > -- > Paul > ... Super-Snip ... > >

[PATCH v2 3/3] t9903: add extra tests for bash.showDirtyState

2013-02-13 Thread Martin Erik Werner
Added 3 extra tests for the bash.showDirtyState config option, tests should now cover all combinations of the shell var being set/unset and the config option being enabled/disabled, given a dirty file. * Renamed test 'disabled by config' to 'shell variable set with config disabled' for consisten

[PATCH v2 2/3] t9903: add tests for bash.showUntrackedFiles

2013-02-13 Thread Martin Erik Werner
Add 4 test for the bash.showUntrackedFiles config option, covering all combinations of the shell var being set/unset and the config option being enabled/disabled. Signed-off-by: Martin Erik Werner --- t/t9903-bash-prompt.sh | 40 1 file changed, 40 inse

[PATCH v2 1/3] shell prompt: add bash.showUntrackedFiles option

2013-02-13 Thread Martin Erik Werner
Add a config option 'bash.showUntrackedFiles' which allows enabling the prompt showing untracked files on a per-repository basis. This is useful for some repositories where the 'git ls-files ...' command may take a long time. Signed-off-by: Martin Erik Werner --- contrib/completion/git-prompt.sh

[PATCH v2 0/3] Add bash.showUntrackedFiles config option

2013-02-13 Thread Martin Erik Werner
On Tue, 2013-02-12 at 14:29 -0800, Junio C Hamano wrote: > Martin Erik Werner writes: > > > Add a test case for the bash.showUntrackedFiles config option, which > > checks that the config option can disable the global effect of the > > GIT_PS1_SHOWUNTRACKEDFILES environmant variable. > > > > Sign

Re: inotify to minimize stat() calls

2013-02-13 Thread Duy Nguyen
On Tue, Feb 12, 2013 at 09:48:18PM +0100, Karsten Blees wrote: > However, the difference between git status -uall and -uno was always > about 1.3 s in all fscache versions, even though > opendir/readdir/closedir was served entirely from the cache. I added > a bit of performance tracing to find the

[PATCH v4 4/4] count-objects: report how much disk space taken by garbage files

2013-02-13 Thread Nguyễn Thái Ngọc Duy
Also issue warnings on loose garbages instead of errors as a result of using report_garbage() function in count_objects() Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-count-objects.txt | 2 ++ builtin/count-objects.c | 18 -- 2 files changed, 14 insertio

[PATCH v4 2/4] sha1_file: reorder code in prepare_packed_git_one()

2013-02-13 Thread Nguyễn Thái Ngọc Duy
The current loop does while (...) { if (!not .idx file) continue; process .idx file; } and is reordered to while (...) { if (!.idx file) { process .idx file; }

[PATCH v4 3/4] count-objects: report garbage files in pack directory too

2013-02-13 Thread Nguyễn Thái Ngọc Duy
prepare_packed_git_one() is modified to allow count-objects to hook a report function to so we don't need to duplicate the pack searching logic in count-objects.c. When report_pack_garbage is NULL, the overhead is insignificant. The garbage is reported with warning() instead of error() in packed g

[PATCH v4 1/4] git-count-objects.txt: describe each line in -v output

2013-02-13 Thread Nguyễn Thái Ngọc Duy
The current description requires a bit of guessing (what clause corresponds to what printed line?) and lacks information, such as the unit of size and size-pack. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-count-objects.txt | 20 +++- 1 file changed, 15 insertions(+

[PATCH v4 0/4] count-objects improvements

2013-02-13 Thread Nguyễn Thái Ngọc Duy
On Wed, Feb 13, 2013 at 12:23 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> +/* A hook for count-objects to report invalid files in pack directory */ >> +extern void (*report_garbage)(const char *desc, const char *path, int len, >> const char *name); > > We may want to document t

Re: Pushing a git repository to a new server

2013-02-13 Thread Michael J Gruber
Jeff King venit, vidit, dixit 12.02.2013 21:42: > On Tue, Feb 12, 2013 at 12:28:53PM +0100, Michael J Gruber wrote: > >> I'm not sure providers like GitHub would fancy an interface which allows >> the programmatic creation of repos (giving a new meaning to "fork >> bomb"). But I bet you know bette