Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Junio C Hamano
Jiang Xin writes: > 2013/2/6 Junio C Hamano : >> Jiang Xin writes: >>> I agree, a helper named 'utf8_fprintf' in utf8.c is better. >>> I will send a patch latter. >> >> Yeah, the idea of a helper function I agree with; I am not thrilled >> with the name utf8_fprintf() though. People use the ret

Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Jiang Xin
2013/2/6 Junio C Hamano : > Jiang Xin writes: >> I agree, a helper named 'utf8_fprintf' in utf8.c is better. >> I will send a patch latter. > > Yeah, the idea of a helper function I agree with; I am not thrilled > with the name utf8_fprintf() though. People use the return value of > fprintf() for

Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Junio C Hamano
Jiang Xin writes: > 2013/2/6 Junio C Hamano : >> I somehow suspect that this is going in a direction that makes this >> piece of code much less maintainable. >> >> Look at the entire function and see how many places you do fprintf >> on strings that are marked with _(). short_name and long_name

[PATCH v3] Add utf8_fprintf helper which returns correct columns

2013-02-05 Thread Jiang Xin
Since command usages can be translated, they may not align well especially when they are translated to CJK. A wrapper utf8_fprintf can help to return the correct columns required. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- parse-options.c | 5 +++-- utf8.c | 20 +

[PATCHv6] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
Add Git credential helper that can parse netrc/authinfo files. This credential helper supports multiple files, returning the first one that matches. It checks file permissions and owner. For *.gpg files, it will run GPG to decrypt the file. Signed-off-by: Ted Zlatanov --- Changes since PATCHv5

Re: importing two different trees into a fresh git repo

2013-02-05 Thread Constantine A. Murenin
On 5 February 2013 14:29, Junio C Hamano wrote: > "Constantine A. Murenin" writes: > >> I have two distinct trees that were not managed by any RCS, and I'd >> like to import them into a single repository into two separate orphan >> branches, then make sense of what's in there, merge, and unify in

Re: [PATCHv5] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 14:24:01 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> +$f =~ s/([;<>\*\|`&\$!#\(\)\[\]\{\}:'"])/\\$1/g; JCH> Yuck. If you really have to quote, it is often far simpler to take JCH> advantage of the fact that quoting rule for shell is much simpler JC

Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Jiang Xin
2013/2/6 Junio C Hamano : > I somehow suspect that this is going in a direction that makes this > piece of code much less maintainable. > > Look at the entire function and see how many places you do fprintf > on strings that are marked with _(). short_name and long_name are > not likely to be tran

Re: [PATCHv5] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Junio C Hamano
Junio C Hamano writes: > Otherwise, looks almost ready to me. For now, I've queued this as a minimum fix-up on top of your patch and pushed the result out. It is an equivalent of the previous review comments in a patch form. Please review and incorporate in your reroll as appropriate. I haven

Re: Rebased git-subtree changes

2013-02-05 Thread Junio C Hamano
This looks to be of mixed quality. The earlier ones look fairly finished, while the later ones not so much. I am tempted to take up to 06/13 and advance them to 'next', without the rest. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-05 Thread Junio C Hamano
Jeff King writes: > On Tue, Jan 29, 2013 at 11:53:19AM -0800, Junio C Hamano wrote: > >> Either way it still encourages a plaintext password to be on disk, >> which may not be what we want, even though it may be slight if not >> really much of an improvement. Again the Help-for-users has this >>

Re: [PATCHv4] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 14:09:58 -0800 Junio C Hamano wrote: JCH> open $io, "-|", qw(gpg --decrypt), $ARGV[0] OK, the below will be in PATCHv6 (I'll wait on mailing it until after you've reviewed the rest of PATCHv5). Thanks for checking... I must have had a typo or a missing comma or something, I

Re: importing two different trees into a fresh git repo

2013-02-05 Thread Junio C Hamano
"Constantine A. Murenin" writes: > I have two distinct trees that were not managed by any RCS, and I'd > like to import them into a single repository into two separate orphan > branches, then make sense of what's in there, merge, and unify into > 'master'. > > (To give some context, it's /etc/ngi

Re: [PATCH v2] t4038: add tests for "diff --cc --raw "

2013-02-05 Thread Junio C Hamano
Thanks. -- 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: [PATCHv4] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > On Tue, 05 Feb 2013 11:53:20 -0800 Junio C Hamano wrote: > > I think it's more readable with large loops, and it actually makes sense > when you read the code. Not a big deal to me either, I just felt for > this particular script it was OK. > >>> + if ($file =~ m/\.gpg

Re: [PATCHv5] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > + unless (scalar @entries) { > + if ($!) { > + log_verbose("Unable to open $file: $!"); > + } > + else { } else { > + log_verbose("No netrc entries found in $file"); > + }

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-02-05 Thread Junio C Hamano
Junio C Hamano writes: > Torsten Bögershausen writes: > >> Thanks for the detailed suggestion. >> Instead of using a file for putting out non portable syntax, >> can we can use a similar logic as test_failure ? > > Your test_bad_syntax_ function can be called from a subshell, and > its "exit 1"

[PATCH v2] t4038: add tests for "diff --cc --raw "

2013-02-05 Thread John Keeping
Signed-off-by: John Keeping --- Changes since v1: - more spaces around '|' - create trees with line feeds and use 'sed -e 4q' --- t/t4038-diff-combined.sh | 24 1 file changed, 24 insertions(+) diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 4027

Re: Bug in "git log --graph -p -m" (version 1.7.7.6)

2013-02-05 Thread Matthieu Moy
Junio C Hamano writes: > wor...@alum.mit.edu (Dale R. Worley) writes: > >> I have found a situation where "git log" produces (apparently) >> endless output. Presumably this is a bug. Following is a (Linux) >> script that reliably reproduces the error for me (on Fedora 16): > > Wasn't this fixed

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 12:23:00 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: JCH> You still need to parse a file that has a "default" entry correctly; JCH> otherwise the users won't be able to share existing .netrc files JCH> with other applications e.g. ftp, which is the whole point of t

[PATCHv5] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
Add Git credential helper that can parse netrc/authinfo files. This credential helper support multiple files, returning the first one that matches. It checks file permissions and owner. For *.gpg files, it will run GPG to decrypt the file. Signed-off-by: Ted Zlatanov --- Changes since PATCHv4:

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-02-05 Thread Junio C Hamano
Torsten Bögershausen writes: > Thanks for the detailed suggestion. > Instead of using a file for putting out non portable syntax, > can we can use a similar logic as test_failure ? Your test_bad_syntax_ function can be called from a subshell, and its "exit 1" will not exit, no? test_exp

Re: [PATCH] t4038: add tests for "diff --cc --raw "

2013-02-05 Thread Junio C Hamano
John Keeping writes: > Signed-off-by: John Keeping > --- > ... > diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh > index 40277c7..a0701bc 100755 > --- a/t/t4038-diff-combined.sh > +++ b/t/t4038-diff-combined.sh > @@ -89,4 +89,33 @@ test_expect_success 'diagnose truncated file' '

Re: [PATCHv4] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 11:53:20 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> Changes since PATCHv3: >> >> - simple tests in Makefile >> - support multiple files, code refactored >> - documentation and comments updated >> - fix IO::File for GPG pipe >> - exit peacefully in almost every

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

2013-02-05 Thread Torsten Bögershausen
On 27.01.13 18:34, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> Back to the which: >> ... >> and running "make test" gives the following, at least in my system: >> ... > I think everybody involved in this discussion already knows that; > the point is that it can easily give false nega

[PATCH] t4038: add tests for "diff --cc --raw "

2013-02-05 Thread John Keeping
Signed-off-by: John Keeping --- On Sun, Feb 03, 2013 at 04:24:52PM -0800, Junio C Hamano wrote: > Ideally it should also have test cases > to show "git diff --cc --raw blob1 blob2...blob$n" for n=4 and n=40 > (or any two values clearly below and above the old hardcoded

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > JCH> You still need to parse a file that has a "default" entry correctly; > JCH> otherwise the users won't be able to share existing .netrc files > JCH> with other applications e.g. ftp, which is the whole point of this > JCH> series. Not using values from the "default" en

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Jeff King
On Tue, Feb 05, 2013 at 05:21:18PM +0100, Michael J Gruber wrote: > Thanks Jeff, that helps a lot! It covers "grep expr" and "grep expr rev > -- path" just fine. I'll look into "grep expr rev:path" which does not > work yet because of an empty driver. > > I also have "show --textconv" covered and

Re: Is anyone working on a next-gen Git protocol (Re: [PATCH v3 0/8] Hiding refs)

2013-02-05 Thread Ævar Arnfjörð Bjarmason
On Tue, Feb 5, 2013 at 5:03 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Do you have any plans for something that *does* have the reduction of >> network bandwidth as a primary goal? > > Uncluttering gives reduction of bandwidth anyway, so I do not see > much point in the dist

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 11:47:56 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: JCH> Oh, another thing. 'default' is like 'machine' followed by any JCH> machine name, so the above while loop that reads two tokens JCH> pair-wise needs to be aware that 'default' is not followed by a JCH> value

Re: [PATCHv4] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > Changes since PATCHv3: > > - simple tests in Makefile > - support multiple files, code refactored > - documentation and comments updated > - fix IO::File for GPG pipe > - exit peacefully in almost every situation, die on bad invocation or query > - use log_verbose() and -v

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > JCH> Oh, another thing. 'default' is like 'machine' followed by any > JCH> machine name, so the above while loop that reads two tokens > JCH> pair-wise needs to be aware that 'default' is not followed by a > JCH> value. I think the loop will fail to parse this: > > JCH>

Re* [PATCH 3/3] apply: diagnose incomplete submodule object name better

2013-02-05 Thread Junio C Hamano
Junio C Hamano writes: > We could read from the payload part of the patch to learn the full > object name of the commit, but the primary user "git rebase" has > been fixed to give us a full object name, so this should suffice > for now. And the patch on top to do so looks like this. With this p

[PATCHv4] Add contrib/credentials/netrc with GPG support

2013-02-05 Thread Ted Zlatanov
Changes since PATCHv3: - simple tests in Makefile - support multiple files, code refactored - documentation and comments updated - fix IO::File for GPG pipe - exit peacefully in almost every situation, die on bad invocation or query - use log_verbose() and -v for logging for the user - use log_deb

Re: Bug in "git log --graph -p -m" (version 1.7.7.6)

2013-02-05 Thread Junio C Hamano
wor...@alum.mit.edu (Dale R. Worley) writes: > I have found a situation where "git log" produces (apparently) > endless output. Presumably this is a bug. Following is a (Linux) > script that reliably reproduces the error for me (on Fedora 16): Wasn't this fixed at v1.8.1.1~13 or is this a diffe

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Junio C Hamano
Michael Haggerty writes: > On 02/05/2013 09:33 AM, Jonathan Nieder wrote: >> Michael Haggerty wrote: >> >>> I would again like to express my discomfort about this feature, which is >>> already listed as "will merge to next". Frankly, I have the feeling >>> that this feature is being steamrolled

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Junio C Hamano
Jonathan Nieder writes: >> * I didn't see a response to Peff's convincing arguments that this >> should be a client-side feature rather than a server-side feature [1]. > > The client can't control the size of the ref advertisement. That is > the main motivation if I understood correctly. The an

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Junio C Hamano
Michael Haggerty writes: > I would again like to express my discomfort about this feature, which is > already listed as "will merge to next". Do not take "will merge to next" too literally. One major purpose of marking a topic as such is exactly to solicit comments like this ;-) > * I didn't s

Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Junio C Hamano
Jiang Xin writes: > Signed-off-by: Jiang Xin > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > parse-options.c | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/parse-options.c b/parse-options.c > index cd029f..be916 100644 > --- a/parse-options.c > +++ b/parse-optio

Bug in "git log --graph -p -m" (version 1.7.7.6)

2013-02-05 Thread Dale R. Worley
I have found a situation where "git log" produces (apparently) endless output. Presumably this is a bug. Following is a (Linux) script that reliably reproduces the error for me (on Fedora 16): -- set -ve # Print the git version. git --version # Create respository. rm -rf .git git init

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Ted Zlatanov
On Tue, 05 Feb 2013 08:15:48 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> +# build reverse token map >> +my %rmap; >> +foreach my $k (keys %{$options{tmap}}) { >> +push @{$rmap{$options{tmap}->{$k}}}, $k; >> +} JCH> Mental note: "$rmap{foo} -eq 'bar'" means that what Git calls

Re: [PATCH v3] status: show the branch name if possible in in-progress info

2013-02-05 Thread Junio C Hamano
Duy Nguyen writes: > On Tue, Feb 5, 2013 at 1:38 PM, Jonathan Nieder wrote: >> Missing description. Stealing from the link you sent: >> >> The typical use-case is starting a rebase, do something else, come >> back >> the day after, run "git status" or make a new commit and wond

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Michael J Gruber
Jeff King venit, vidit, dixit 05.02.2013 12:13: > On Mon, Feb 04, 2013 at 04:27:31PM +0100, Michael J Gruber wrote: > >> Recently and not so recently, we made sure that log/grep type operations >> use textconv filters when a userfacing diff would do the same: >> >> ef90ab6 (pickaxe: use textconv f

[PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-05 Thread Jiang Xin
Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- parse-options.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/parse-options.c b/parse-options.c index cd029f..be916 100644 --- a/parse-options.c +++ b/parse-options.c @@ -497,6 +497,8 @@ static int usa

[PATCH v2 1/2] Get correct column with for options in command usage

2013-02-05 Thread Jiang Xin
Command usage would not align well if command options are translated, especially to CJK. Call utf8_strwidth in function usage_argh, so that the caller will get correct column width. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy --- parse-options.c | 8 ++-- 1 file changed, 6

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Junio C Hamano
Junio C Hamano writes: > I thought I've given a more concrete outline than "I'll read > Net::Netrc and do whatever I think it does" in a separate message. And it turns out that the message was sitting in my outbox. Sorry. I just told the outbox to send it out. -- To unsubscribe from this list:

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > +# build reverse token map > +my %rmap; > +foreach my $k (keys %{$options{tmap}}) { > + push @{$rmap{$options{tmap}->{$k}}}, $k; > +} Mental note: "$rmap{foo} -eq 'bar'" means that what Git calls 'bar' is found as 'foo' in the netrc/authinfo file. Keys in %rmap are wh

Re: [PATCH] Get correct column with for options in command usage

2013-02-05 Thread Junio C Hamano
Duy Nguyen writes: > On Tue, Feb 5, 2013 at 7:15 PM, Duy Nguyen wrote: >> + fprintf(outfile, sb.buf); > > Use fputs instead. I looked up fputs man page but somehow still left > fprintf there. Once the streams of "oops that was wrong" comments are done, I'd appreciate if one of you guys se

Re: [PATCH v3 2/8] git_remote_helpers: fix input when running under Python 3

2013-02-05 Thread Erik Faye-Lund
On Fri, Jan 25, 2013 at 9:23 PM, Brandon Casey wrote: > On Wed, Jan 23, 2013 at 12:36 PM, Junio C Hamano wrote: >> Sverre Rabbelier writes: >> >>> On Wed, Jan 23, 2013 at 11:47 AM, John Keeping wrote: > When did we last revisit what minimal python version we are ok with > requiring? >>

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Junio C Hamano
Ted Zlatanov writes: > On Mon, 04 Feb 2013 16:15:47 -0800 Junio C Hamano wrote: > > JCH> Ted Zlatanov writes: > >>> - do you want to support backslashed newlines? > > JCH> What for? netrc/authinfo is not a line oriented file format at all, > JCH> and > > JCH> machine k.org > JCH>

Re: Is anyone working on a next-gen Git protocol (Re: [PATCH v3 0/8] Hiding refs)

2013-02-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Do you have any plans for something that *does* have the reduction of > network bandwidth as a primary goal? Uncluttering gives reduction of bandwidth anyway, so I do not see much point in the distinction you seem to be making. > Is this what you've been workin

Re: [PATCH v3 7/8] fetch: fetch objects by their exact SHA-1 object names

2013-02-05 Thread Junio C Hamano
Jeff King writes: > On Wed, Jan 30, 2013 at 10:45:41AM -0800, Junio C Hamano wrote: > >> Teach "git fetch" to accept an exact SHA-1 object name the user may >> obtain out of band on the LHS of a pathspec, and send it on a "want" >> message when the server side advertises the allow-tip-sha1-in-wan

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On a related note then, it's a bit confusing that it's called > "--full-diff" when it doesn't actually show a diff. It is too late to change the name of the option, but we could add a synonym if it makes easier to understand what the option is for. It is about

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Junio C Hamano
Jeff King writes: > git log --cc --stat > > the "--cc" is significant. So I don't think it is right for "--cc" to > always imply "-p". But if the rule kicked in only when no other format > had been specified, that might make sense. Yes, it was my mistake that I left it unsaid. Obviously the d

Re: [PATCH v3 3/8] upload/receive-pack: allow hiding ref hierarchies

2013-02-05 Thread Junio C Hamano
Jeff King writes: > On Wed, Jan 30, 2013 at 10:45:37AM -0800, Junio C Hamano wrote: > >> Teach upload-pack and receive-pack to omit some refs from their >> initial advertisements by paying attention to the transfer.hiderefs >> multi-valued configuration variable. Any ref that is under the >> hie

Re: [PATCH 11/13] contrib/subtree: Make each test self-contained

2013-02-05 Thread Junio C Hamano
gree...@obbligato.org writes: > Junio C Hamano writes: > >> "David A. Greene" writes: >> >>> +test_create_commit() ( >>> + repo=$1 >>> + commit=$2 >>> + cd "$repo" >>> + mkdir -p "$(dirname "$commit")" >>> + echo "$commit" > "$commit" >> >> Style. > > I need a little more explanation.

Re: Feature request: Allow extracting revisions into directories

2013-02-05 Thread Phil Hord
On Sun, Feb 3, 2013 at 7:42 PM, Sitaram Chamarty wrote: > On 02/03/2013 11:41 PM, Robert Clausecker wrote: >> >> Am Sonntag, den 03.02.2013, 21:55 +0530 schrieb Sitaram Chamarty: >>> Could you help me understand why piping it to tar (actually 'tar -C >>> /dest/dir -x') is not sufficient to achieve

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Ævar Arnfjörð Bjarmason
On Tue, Feb 5, 2013 at 12:22 PM, Jeff King wrote: > On Tue, Feb 05, 2013 at 11:16:52AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano wrote: >> > "git log/diff-files -U8" do not need "-p" to enable textual patches, >> > for example. It is "I already tol

Re: [PATCH] Add contrib/credentials/netrc with GPG support, try #2

2013-02-05 Thread Ted Zlatanov
On Mon, 04 Feb 2013 16:15:47 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> - do you want to support backslashed newlines? JCH> What for? netrc/authinfo is not a line oriented file format at all, JCH> and JCH>machine k.org JCH>login me JCH>

Re: [PATCH 13/13] contrib/subtree: Remove --annotate

2013-02-05 Thread James Nylen
On Tue, Feb 5, 2013 at 6:44 AM, wrote: > Junio C Hamano writes: > >>> Remove --annotate. This obviates the need for an --unannotate >>> command. We really want a more generalized commit message rewrite >>> mechanism. >> >> That may be a good goal as the end result, but wouldn't it be a bit >>

ցանցային ադմինիստրատոր

2013-02-05 Thread ADMIN
Ձեր փոստարկղը գերազանցել է 2 GB սահմանափակումը, քանի որ մեր Webmaster, դուք runing ժամը 2.30GB, դուք չեք կարող ուղարկել կամ ստանալ նոր հաղորդագրությունները, քանի դեռ չեք հաստատել Ձեր մուտքի արկղը. Լրացրեք ստորեւ բերված ձեւը եւ հաստատեք ձեր հաշիվը. Լրացրեք պահանջվող տեղեկությունները եւ ուղարկելը:

Re: [PATCH v3] status: show the branch name if possible in in-progress info

2013-02-05 Thread Duy Nguyen
On Tue, Feb 5, 2013 at 1:38 PM, Jonathan Nieder wrote: > Missing description. Stealing from the link you sent: > > The typical use-case is starting a rebase, do something else, come > back > the day after, run "git status" or make a new commit and wonder what > in the wor

Re: [PATCH] Get correct column with for options in command usage

2013-02-05 Thread Duy Nguyen
On Tue, Feb 5, 2013 at 7:15 PM, Duy Nguyen wrote: > + fprintf(outfile, sb.buf); Use fputs instead. I looked up fputs man page but somehow still left fprintf there. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: [PATCH] Get correct column with for options in command usage

2013-02-05 Thread Duy Nguyen
On Tue, Feb 05, 2013 at 03:40:32PM +0800, Jiang Xin wrote: > Command usage would not align well if command options are translated, > especially to CJK. Call utf8_strwidth in function usage_argh, so that > the caller will get correct column width. Yeah, I just noticed a misalignment in Vietnamese t

[PATCH 11/13] contrib/subtree: Make each test self-contained

2013-02-05 Thread David A. Greene
From: Techlive Zheng Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 871 +--- 1 file changed, 613 insertions(+), 258 deletions(-) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-

[PATCH 10/13] contrib/subtree: Code cleaning and refactoring

2013-02-05 Thread David A. Greene
From: Techlive Zheng Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 270 ++-- 1 file changed, 136 insertions(+), 134 deletions(-) diff --git a/contrib/subtr

[PATCH 13/13] contrib/subtree: Remove --annotate

2013-02-05 Thread David A. Greene
From: "David A. Greene" Remove --annotate. This obviates the need for an --unannotate command. We really want a more generalized commit message rewrite mechanism. Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |6 + contrib/subtree/t/t7900-subtree.sh | 50 +++

[PATCH 12/13] contrib/subtree: Handle '--prefix' argument with a slash appended

2013-02-05 Thread David A. Greene
From: Techlive Zheng 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |2 +- contrib/subtree/t/t7900-subtree.sh | 19 +++ 2 files changed,

Re: Rebased git-subtree changes

2013-02-05 Thread greened
"David A. Greene" writes: > Here's a re-send of the git-subtree patches after rebasing onto > master. Hopefully Junio will have better luck applying these. Damn. Sorry, I sent this before getting all of the feedback. Just ignore this sequence and I'll send a fixed version in the future.

[PATCH 05/13] contrib/subtree: Honor DESTDIR

2013-02-05 Thread David A. Greene
From: Adam Tkac Teach git-subtree's Makefile to honor DESTDIR. Signed-off-by: Adam Tkac Signed-off-by: David A. Greene --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 05cdd5c..36a

[PATCH 08/13] contrib/subtree: Add vim modeline

2013-02-05 Thread David A. Greene
From: Techlive Zheng Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |2 ++ contrib/subtree/t/t7900-subtree.sh |2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index

[PATCH 07/13] contrib/subtree: Fix whitespaces

2013-02-05 Thread David A. Greene
From: Techlive Zheng Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt| 42 ++--- contrib/subtree/t/t7900-subtree.sh | 314

[PATCH 06/13] contrib/subtree: Make the Manual Directory if Needed

2013-02-05 Thread David A. Greene
From: "Jesper L. Nielsen" Before install git-subtree documentation, make sure the manpage directory exists. Signed-off-by: Jesper L. Nielsen Signed-off-by: David A. Greene --- contrib/subtree/Makefile |1 + 1 file changed, 1 insertion(+) diff --git a/contrib/subtree/Makefile b/contrib/su

[PATCH 09/13] contrib/subtree: Ignore testing directory

2013-02-05 Thread David A. Greene
From: Techlive Zheng Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/.gitignore |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 91360a3..59aeeb4 100644 --- a/contrib/subtr

[PATCH 03/13] contrib/subtree: Better Error Handling for add

2013-02-05 Thread David A. Greene
From: "David A. Greene" 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 --- contrib/subtree/git-subtree.sh | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/

[PATCH 04/13] contrib/subtree: Fix Synopsis

2013-02-05 Thread David A. Greene
From: "David A. Greene" Fix the documentation of add to show that a repository can be specified along with a commit. Suggested by Yann Dirson . Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |6 ++ contrib/subtree/git-subtree.txt |3 ++- 2 files changed, 8 inse

[PATCH 02/13] contrib/subtree: Use %B for Split Subject/Body

2013-02-05 Thread David A. Greene
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. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene --- contrib/subtree/git-subtree.sh |2 +- contrib/subtree/t/t7900-subtree.sh | 15 +++

Rebased git-subtree changes

2013-02-05 Thread David A. Greene
Here's a re-send of the git-subtree patches after rebasing onto master. Hopefully Junio will have better luck applying these. -David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH 01/13] contrib/subtree: Remove Test Number Comments

2013-02-05 Thread David A. Greene
From: "David A. Greene" Delete the comments indicating test numbers as it causes maintenance headaches. t*.sh -i will help us find any broken tests. Signed-off-by: David A. Greene --- contrib/subtree/t/t7900-subtree.sh | 55 1 file changed, 55 deletions(

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Jeff King
On Tue, Feb 05, 2013 at 11:16:52AM +0100, Ævar Arnfjörð Bjarmason wrote: > On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano wrote: > > "git log/diff-files -U8" do not need "-p" to enable textual patches, > > for example. It is "I already told you that I want 8-line context. > > For what else, othe

Re: [PATCH v3 7/8] fetch: fetch objects by their exact SHA-1 object names

2013-02-05 Thread Jeff King
On Tue, Feb 05, 2013 at 04:19:38AM -0500, Jeff King wrote: > But taking a step back, this really seems quite inferior to an > extension that would allow the client to share its refspecs with the > server. That would solve the bandwidth efficiency problem for normal > fetchers who are I should ha

Re: Is anyone working on a next-gen Git protocol (Re: [PATCH v3 0/8] Hiding refs)

2013-02-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 30, 2013 at 7:45 PM, Junio C Hamano wrote: > The third round. > > - Multi-valued variable transfer.hiderefs lists prefixes of ref >hierarchies to be hidden from the requests coming over the >network. > > - A configuration optionally allows uploadpack to accept fetch >requ

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Jeff King
On Mon, Feb 04, 2013 at 04:27:31PM +0100, Michael J Gruber wrote: > Recently and not so recently, we made sure that log/grep type operations > use textconv filters when a userfacing diff would do the same: > > ef90ab6 (pickaxe: use textconv for -S counting, 2012-10-28) > b1c2f57 (diff_grep: use t

will git provide `submodule remove` option ?‏

2013-02-05 Thread Lingcha X
As we all know, git provides `submodule add , init, update, sync, sumary, foreach, status`, but where is `submodule remove`? will I not delete one of them sometime in the future? Although most people will not use submodule or one who uses it can remove submodule by hand, providing complete opt

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Michael Haggerty
On 02/05/2013 09:33 AM, Jonathan Nieder wrote: > Michael Haggerty wrote: > >> I would again like to express my discomfort about this feature, which is >> already listed as "will merge to next". Frankly, I have the feeling >> that this feature is being steamrolled in before a community consensus >

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Ævar Arnfjörð Bjarmason
On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano wrote: > "git log/diff-files -U8" do not need "-p" to enable textual patches, > for example. It is "I already told you that I want 8-line context. > For what else, other than showing textual diff, do you think I told > you that for?" and replacing "8

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Jeff King
On Mon, Feb 04, 2013 at 08:36:43AM -0800, Junio C Hamano wrote: > "git log/diff-files -U8" do not need "-p" to enable textual patches, > for example. It is "I already told you that I want 8-line context. > For what else, other than showing textual diff, do you think I told > you that for?" and re

Re: [PATCH v3 7/8] fetch: fetch objects by their exact SHA-1 object names

2013-02-05 Thread Jeff King
On Wed, Jan 30, 2013 at 10:45:41AM -0800, Junio C Hamano wrote: > Teach "git fetch" to accept an exact SHA-1 object name the user may > obtain out of band on the LHS of a pathspec, and send it on a "want" > message when the server side advertises the allow-tip-sha1-in-want > capability. Hmm. The

Re: Assorted contrib/subtree Patches

2013-02-05 Thread Jakub Suder
Can I please unsubscribe from this thing?... Thanks. Jakub Suder On 5 February 2013 05:06, David A. Greene wrote: > All of the patches I have received from others as well as a few of my > own follow. Probably the most controversial is a patch to remove > --annotate. After some discussion on t

Re: [RFC] Should "log --cc" imply "log --cc -p"?

2013-02-05 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 17:36: > Michael J Gruber writes: > >> But diffs are on here ("-p"), it's just that the default diff option for >> merges is to not display them. Well, I admit there's two different ways >> of thinking here: >> >> A) "git log -p" turns on diffs for al

Re: Feature request: Allow extracting revisions into directories

2013-02-05 Thread Sitaram Chamarty
On Mon, Feb 4, 2013 at 10:22 PM, Junio C Hamano wrote: > Tomas Carnecky writes: > >> That's what `git checkout` is for. And I would even argue that it's the >> better >> choice in your situation because it would delete files from /var/www/foo >> which >> you have deleted in your repo. git archi

Re: [PATCH v3 3/8] upload/receive-pack: allow hiding ref hierarchies

2013-02-05 Thread Jeff King
On Wed, Jan 30, 2013 at 10:45:37AM -0800, Junio C Hamano wrote: > Teach upload-pack and receive-pack to omit some refs from their > initial advertisements by paying attention to the transfer.hiderefs > multi-valued configuration variable. Any ref that is under the > hierarchies listed on the valu

Re: [WIP/RFH/RFD/PATCH] grep: allow to use textconv filters

2013-02-05 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 04.02.2013 18:12: > Michael J Gruber writes: > >> Recently and not so recently, we made sure that log/grep type operations >> use textconv filters when a userfacing diff would do the same: >> >> ef90ab6 (pickaxe: use textconv for -S counting, 2012-10-28) >> b1c2

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Jonathan Nieder
Hi Michael, Michael Haggerty wrote: > I would again like to express my discomfort about this feature, which is > already listed as "will merge to next". Frankly, I have the feeling > that this feature is being steamrolled in before a community consensus > has been reached and indeed before many

Re: [PATCH v3 0/8] Hiding refs

2013-02-05 Thread Michael Haggerty
On 01/30/2013 07:45 PM, Junio C Hamano wrote: > The third round. > > - Multi-valued variable transfer.hiderefs lists prefixes of ref >hierarchies to be hidden from the requests coming over the >network. > > - A configuration optionally allows uploadpack to accept fetch >requests for