Re: [PATCH] git.txt: update description of the configuration mechanism

2013-02-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.02.2013 19:03: Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: But the exact location of per-user and per-repository configuration files does not matter in this context and is best left to the git-config

Re: [PATCH 1/5] gpg-interface: check good signature in a reliable way

2013-02-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.02.2013 18:22: Michael J Gruber g...@drmicha.warpmail.net writes: Currently, verify_signed_buffer() only checks the return code of gpg, and some callers implement additional unreliable checks for Good signature in the gpg output meant for the user. Use

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

2013-02-15 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: warning: The behavior of 'git add --update (or -u)' with no path argument from a subdirectory of the tree will change in Git 2.0 and should not be used anymore. There is a logic gap between will

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

2013-02-15 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

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

2013-02-15 Thread Mariusz Gronczewski
2013/2/14 Junio C Hamano gits...@pobox.com: - The right one you mention for %GS is easier than you might think. If you just verify against the accompanying tagger identity, that should be sufficient. It of course cannot be generally solved, as you could tag as person A

[PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Nguyễn Thái Ngọc Duy
read_directory() (and its friendly wrapper fill_directory) collects untracked/ignored files by traversing through the whole worktree (*), feeding every entry to treat_one_path(), where each entry is checked against .gitignore patterns. One may see that tracked files can't be excluded and we do

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

2013-02-15 Thread Junio C Hamano
Mariusz Gronczewski xani...@gmail.com writes: 2013/2/14 Junio C Hamano gits...@pobox.com: - The right one you mention for %GS is easier than you might think. If you just verify against the accompanying tagger identity, that should be sufficient. It of course cannot be

Re: [PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: read_directory() (and its friendly wrapper fill_directory) collects untracked/ignored files by traversing through the whole worktree (*), feeding every entry to treat_one_path(), where each entry is checked against .gitignore patterns. One may

Re: [PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Duy Nguyen
On Fri, Feb 15, 2013 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote: In the current code, we always check if a path is excluded, and when dealing with DT_REG/DT_LNK, we call treat_file(): * When such a path is excluded, treat_file() returns true when we are not showing ignored

Re: [PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-15 Thread Brandon Casey
On Thu, Feb 14, 2013 at 9:58 AM, John Keeping j...@keeping.me.uk wrote: On Tue, Feb 12, 2013 at 02:33:42AM -0800, 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 refrain from adding an additional one

Re: [PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Fri, Feb 15, 2013 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote: In the current code, we always check if a path is excluded, and when dealing with DT_REG/DT_LNK, we call treat_file(): * When such a path is excluded, treat_file() returns true

[BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-15 Thread Alain Kalker
tl;dr: - `git bundle create` without git-rev-list-args gives git rev-list help, then dies. Should point out missing git-rev-list-args instead. - `git clone bundle dir gives ERROR: Repository not found. - `strace ... git clone bundle dir` (magically) appears to work but cannot checkout

You have exceeded the email quota limit

2013-02-15 Thread wlewis
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:

Re: You have exceeded the email quota limit

2013-02-15 Thread Alain Kalker
On Fri, 15 Feb 2013 14:22:53 -0600, wlewis wrote: Spam, spam, beautiful SPAM. 'nuff said. -- 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

[PATCH] contrib/subtree: remove contradicting use options on echo wrapper

2013-02-15 Thread Paul Campbell
Remove redundant -n option and raw ^M in call to echo. Call to 'say' function, a wrapper of 'echo', passed the parameter -n, then included a raw ^M newline in the end of the last parameter. Yet the -n option is meant to suppress the addition of new line by echo. Signed-off-by: Paul Campbell

Re: [BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-15 Thread Alain Kalker
On Fri, 15 Feb 2013 20:33:24 +0100, Alain Kalker wrote: tl;dr: - `git bundle create` without git-rev-list-args gives git rev-list help, then dies. Should point out missing git-rev-list-args instead. - `git clone bundle dir gives ERROR: Repository not found. - `strace ... git clone

Re: [PATCH] contrib/subtree: remove contradicting use options on echo wrapper

2013-02-15 Thread Junio C Hamano
Paul Campbell pcampb...@kemitix.net writes: Remove redundant -n option and raw ^M in call to echo. Call to 'say' function, a wrapper of 'echo', passed the parameter -n, then included a raw ^M newline in the end of the last parameter. Yet the -n option is meant to suppress the addition of new

[PATCH v2 1/3] contrib/subtree: Store subtree sources in .gitsubtree and use for push/pull

2013-02-15 Thread Paul Campbell
Add the prefix, repository and refspec in the file .gitsubtree when git subtree add is used. Then when a git subtree push or pull is needed the repository and refspec from .gitsubtree are used as the default values. Having to remember what subtree came from what source is a waste of developer

[PATCH 2/3] contrib/subtree/t: Added tests for .gitsubtree support

2013-02-15 Thread Paul Campbell
add: ensure details are added to .gitsubtree push: check for a SHA1 update line pull: add a file on one subtree, push it to a branch, then pull into another subtree containing the same branch and confirm the files match add: ensure stale .gitsubtree entry is replaced Signed-off-by: Paul

[PATCH 3/3] contrib/subtree: update documentation

2013-02-15 Thread Paul Campbell
Indicate that repository and refspec are now optional on push and pull. Add notes to add, push and pull about storing values in .gitsubtree and their use as default values. Signed-off-by: Paul Campbell pcampb...@kemitix.net --- contrib/subtree/git-subtree.txt | 13 + 1 file changed,

Re: [PATCH 2/3] contrib/subtree/t: Added tests for .gitsubtree support

2013-02-15 Thread Jonathan Nieder
Hi Paul, Paul Campbell wrote: --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -465,4 +465,34 @@ test_expect_success 'verify one file change per commit' ' [...] +test_expect_success 'change in subtree is pushed okay' ' +cd copy0 create new_file

Re: [PATCH 2/3] contrib/subtree/t: Added tests for .gitsubtree support

2013-02-15 Thread Paul Campbell
Hi Jonathan, On Fri, Feb 15, 2013 at 10:56 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi Paul, Paul Campbell wrote: --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -465,4 +465,34 @@ test_expect_success 'verify one file change per commit' ' [...]

Re: [PATCH] contrib/subtree: remove contradicting use options on echo wrapper

2013-02-15 Thread Paul Campbell
On Fri, Feb 15, 2013 at 10:39 PM, Junio C Hamano gits...@pobox.com wrote: Paul Campbell pcampb...@kemitix.net writes: Remove redundant -n option and raw ^M in call to echo. Call to 'say' function, a wrapper of 'echo', passed the parameter -n, then included a raw ^M newline in the end of the

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

2013-02-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com 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

supports diff.context config for git-diff-tree

2013-02-15 Thread 乙酸鋰
Dear Sir, In git 1.8.1, git-diff supports diff.context config. However, git-diff-tree does not support this. Could you also add this to git-diff-tree? Regards, ch3cooli -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: supports diff.context config for git-diff-tree

2013-02-15 Thread Junio C Hamano
乙酸鋰 ch3co...@gmail.com writes: In git 1.8.1, git-diff supports diff.context config. However, git-diff-tree does not support this. Could you also add this to git-diff-tree? That's more or less deliberate, isn't it? Cosmetic details of the output from plumbing commands should not be affected

Re: [BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-15 Thread Alain Kalker
On Fri, 15 Feb 2013 22:25:47 +, Alain Kalker wrote: On Fri, 15 Feb 2013 20:33:24 +0100, Alain Kalker wrote: tl;dr: - `git bundle create` without git-rev-list-args gives git rev-list help, then dies. Should point out missing git-rev-list-args instead. - `git clone bundle dir gives

Re: [BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-15 Thread Junio C Hamano
Alain Kalker a.c.kal...@gmail.com writes: P.S. I hereby promise to _never_ _ever_ alias `git` to something else and then post a Git bug about that something else on this ML. Sorry to have wasted your time, Thanks. People around here tend to be quiet until they sufficiently have dug the

Re: [PATCH] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Duy Nguyen
On Sat, Feb 16, 2013 at 2:32 AM, Junio C Hamano gits...@pobox.com wrote: If you consider read_directory_recursive alone, there is a regression. The return value of r_d_r depends on path_handled/path_ignored. With this patch, the return value will be different. That is exactly what was missing

Re: [BUG] Git clone of a bundle fails, but works (somewhat) when run with strace

2013-02-15 Thread Jeff King
On Sat, Feb 16, 2013 at 12:03:58AM +, Alain Kalker wrote: ---test.sh--- #!/bin/sh make clean make || return 125 GIT=$(pwd)/git cd /tmp rm -rf testrepo mkdir testrepo cd testrepo $GIT init echo test test.txt $GIT add test.txt $GIT commit -m Add test.txt $GIT bundle create

[PATCH 1/4] difftool: silence uninitialized variable warning

2013-02-15 Thread David Aguilar
Git::config() returns `undef` when given keys that do not exist. Check that the $guitool value is defined to prevent a noisy Use of uninitialized variable $guitool in length warning. Signed-off-by: David Aguilar dav...@gmail.com --- git-difftool.perl | 2 +- 1 file changed, 1 insertion(+), 1

[PATCH 2/4] t7800: Update copyright notice

2013-02-15 Thread David Aguilar
Signed-off-by: David Aguilar dav...@gmail.com --- t/t7800-difftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index eb1d3f8..bb3158a 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -1,6 +1,6 @@ #!/bin/sh # -#

[PATCH 3/4] t7800: modernize tests

2013-02-15 Thread David Aguilar
Eliminate a lot of redundant work by using test_config(). Chain everything together by using sane_unset() and a simpler difftool_test_setup(). The original tests relied upon restore_test_defaults() from the previous test to provide the next test with a sane environment. Make the tests do their

[PATCH 4/4] t7800: defaults is no longer a builtin tool name

2013-02-15 Thread David Aguilar
073678b8e6324a155fa99f40eee0637941a70a34 reworked the mergetools/ directory so that every file corresponds to a difftool-supported tool. When this happened the defaults file went away as it was no longer needed by mergetool--lib. t7800 tests that configured commands can override builtins, but

Re: [PATCH 2/4] t7800: Update copyright notice

2013-02-15 Thread David Aguilar
On Fri, Feb 15, 2013 at 9:47 PM, David Aguilar dav...@gmail.com wrote: Signed-off-by: David Aguilar dav...@gmail.com --- t/t7800-difftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index eb1d3f8..bb3158a 100755 ---

[PATCH 0/3] make smart-http more robust against bogus server input

2013-02-15 Thread Jeff King
For the most part, smart-http just passes data to fetch-pack and send-pack, which take care of the heavy lifting. However, I did find a few corner cases around truncated data from the server, one of which can actually cause a deadlock. I found these because I was trying to figure out what was

[PATCH 1/3] pkt-line: teach packet_get_line a no-op mode

2013-02-15 Thread Jeff King
You can use packet_get_line to parse a single packet out of a stream and into a buffer. However, if you just want to throw away a set of packets from the stream, there's no need to even bother copying the bytes. This patch treats a NULL output buffer as a hint that the caller does not even want to

[PATCH 2/3] remote-curl: verify smart-http metadata lines

2013-02-15 Thread Jeff King
A smart http ref advertisement starts with a packet containing the service header, followed by an arbitrary number of packets containing other metadata headers, followed by a flush packet. We don't currently recognize any other metadata headers, so we just parse through any extra packets,

[PATCH 3/3] remote-curl: sanity check ref advertisement from server

2013-02-15 Thread Jeff King
If the smart HTTP response from the server is truncated for any reason, we will get an incomplete ref advertisement. If we then feed this incomplete list to fetch-pack, one of a few things may happen: 1. If the truncation is in a packet header, fetch-pack will notice the bogus line and

[PATCH v2] read_directory: avoid invoking exclude machinery on tracked files

2013-02-15 Thread Nguyễn Thái Ngọc Duy
read_directory() (and its friendly wrapper fill_directory) collects untracked/ignored files by traversing through the whole worktree, feeding every entry to treat_one_path(), where each entry is checked against .gitignore patterns. One may see that tracked files can't be excluded and we do not