Re: [PATCH 0/3] Update HTTPD/daemon tests for new push.default

2013-01-15 Thread Junio C Hamano
These are tests that I do not usually run myself. Thanks for catching and correcting them. -- 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] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Duy Nguyen
On Wed, Jan 16, 2013 at 9:33 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: Actually I'd like to remove that function. This is what I had in mind: I think the replacement logic to find the

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-15 Thread greened
Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-15 Thread greened
Junio C Hamano gits...@pobox.com writes: David, how would you like to handle a reroll of this piece? I'll just get the test fix from Techlive Zheng, apply it to my branch and re-send. Are you incorporating the other patches? Should I drop them from my list? -David --

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

2013-01-15 Thread greened
Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index c5bce41..75aa690 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -198,6

Re: [PATCH 4/7] contrib/subtree: Better Error Handling for add

2013-01-15 Thread greened
Junio C Hamano gits...@pobox.com writes: David A. Greene gree...@obbligato.org writes: From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene

Re: [PATCH 0/7] guilt patches, including git 1.8 support

2013-01-15 Thread Theodore Ts'o
On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote: 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

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

2013-01-15 Thread greened
gree...@obbligato.org writes: I think this paragraph inherits existing breakage from the beginning of time, but I do not think the above will format the second and subsequent paragraphs correctly. Ok, I'll take a look. I don't know what correctly is but it is at least formatted in a similar

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

2013-01-15 Thread Junio C Hamano
gree...@obbligato.org writes: gree...@obbligato.org writes: I think this paragraph inherits existing breakage from the beginning of time, but I do not think the above will format the second and subsequent paragraphs correctly. Ok, I'll take a look. I don't know what correctly is but it

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 16, 2013 at 9:33 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: Actually I'd like to remove that function. This is what I had in mind: I think

git fetch without --recurse-submodules option

2013-01-15 Thread 乙酸鋰
Hi, With git pull or git fetch without specifying --recurse-submodules, what is the default action? It seems git fetches submodules wtihout specifying --recurse-submodules. If this is not clear, please update documentation. In git pull document --recurse-submodules option, it tells users to see

Re: [PATCH] attr: fix off-by-one directory component length calculation

2013-01-15 Thread Duy Nguyen
On Tue, Jan 15, 2013 at 09:35:21PM -0800, Junio C Hamano wrote: Also the original only scanned the string from the beginning once (instead of letting strlen() to scan once and go back). But we do need to strlen() anyway in collect_all_attrs(). That is exactly my point, isn't it? OK I

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

2013-01-15 Thread Torsten Bögershausen
On 01/16/2013 12:24 AM, Jeff King wrote: On Tue, Jan 15, 2013 at 12:49:05PM -0800, Junio C Hamano wrote: Jean-Noël AVILAavila...@gmail.com writes: Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known issue? Which branch? t9902.10 is overly sensitive to extra git

Re: [PATCH] Allow custom comment char

2013-01-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Ralf Thielow ralf.thie...@gmail.com writes: ... Looks like a good progress overall, except for nits here and there. diff --git a/builtin/notes.c b/builtin/notes.c index 453457a..5e84e35 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -92,10

Pandora charms together with Way Earrings to your Holiday season

2013-01-15 Thread elizabethy
On a occasion, for anybody who is attired that will remove, basically add more pandora charms canada http://www.pandoracheapcanada.com to your solution utilizing wineglass beads. That's it all!! You are definitely that will swipe any clearly show as soon as the wineglass beads replicate any

[PATCH v3 0/3] Rework git-diff algorithm selection

2013-01-15 Thread Michal Privoznik
It's been a while I was trying to get this in. Recently, I realized how important this is. Please keep me CC'ed as I am not subscribed to the list. diff to v1: -Junio's suggestions worked in diff to v2: -yet more Junio's suggestions included Michal Privoznik (3): git-completion.bash:

[PATCH v3 1/3] git-completion.bash: Autocomplete --minimal and --histogram for git-diff

2013-01-15 Thread Michal Privoznik
Even though --patience was already there, we missed --minimal and --histogram for some reason. Signed-off-by: Michal Privoznik mpriv...@redhat.com --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v3 3/3] diff: Introduce --diff-algorithm command line option

2013-01-15 Thread Michal Privoznik
Since command line options have higher priority than config file variables and taking previous commit into account, we need a way how to specify myers algorithm on command line. However, inventing `--myers` is not the right answer. We need far more general option, and that is `--diff-algorithm`.

[PATCH v3 2/3] config: Introduce diff.algorithm variable

2013-01-15 Thread Michal Privoznik
Some users or projects prefer different algorithms over others, e.g. patience over myers or similar. However, specifying appropriate argument every time diff is to be used is impractical. Moreover, creating an alias doesn't play nicely with other tools based on diff (git-show for instance). Hence,

<    1   2