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

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 --- parse-options.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --g

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

Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy 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 wo

On (re)packing

Just a random thought... "git pack-objects" runs "rev-list --objects" to obtain three different kinds of information about objects: * Reachability. Objects that appear in the output of rev-list are relevant, and those that do not are not; * Recency, aka closeness in the time dimension. Ob

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

"David A. Greene" writes: > From: "David A. Greene" > > 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 unhelpful to remove these

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

"David A. Greene" writes: > 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.s

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

"David A. Greene" writes: > +test_create_commit() ( > + repo=$1 > + commit=$2 > + cd "$repo" > + mkdir -p "$(dirname "$commit")" > + echo "$commit" > "$commit" Style. > + git add "$commit" > + git commit -m "$commit" > +) Very nice, but don't we want to check for po

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

"David A. Greene" writes: > 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(+

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

"David A. Greene" writes: > From: Techlive Zheng > > Previous code does not fulfill Git's whitespace policy. > > Signed-off-by: Techlive Zheng > Signed-off-by: David A. Greene > --- This does not seem to apply; I hand-tweaked it to make it apply, but the reindentation of t/t7900 does not look

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

Thanks. This is minor but I'd prefer to see that Subject lines Not To Do Title Case (please see "git log --oneline --no-merges -20 master" and imitate them for uniformity). I'll tweak them while queuing so this alone is not a reason for having to resend. Thanks. -- To unsubscribe from this list

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

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

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 12/13] contrib/subtree: Handle '--prefix' argument with a slash appended

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,

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

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 +++

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

"David A. Greene" writes: > From: Techlive Zheng > Justification is missing here. contrib/subtree/Makefile seems to do "rm -rf" on 'mainline' and 'subproj' in its "clean" target, which makes them look like build/test artifacts that need to be ignored. If they are no longer build/test artifact

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

"David A. Greene" writes: > 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-sub

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

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 09/13] contrib/subtree: Ignore testing directory

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 07/13] contrib/subtree: Fix whitespaces

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

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 05/13] contrib/subtree: Honor DESTDIR

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 04/13] contrib/subtree: Fix Synopsis

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 03/13] contrib/subtree: Better Error Handling for add

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 02/13] contrib/subtree: Use %B for Split Subject/Body

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 +++

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

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: [PATCH] Verify Content-Type from smart HTTP servers

Shawn Pearce writes: > Looks fine to me too, but I think the test won't work now. :-) Heh, that's amusing ;-) t/t5551-http-fetch.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index cb95b95..47eb769 100755 --- a/t/t5551-ht

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

Ted Zlatanov writes: > On Mon, 04 Feb 2013 15:40:32 -0800 Junio C Hamano wrote: > > JCH> "Sorry we couldn't" sounded like an error messag to me. If this is > JCH> a normal exit, then please make sure it is a normal exit. > > OK; done in PATCHv4: removed all "Sorry" because they are not abnorma

A fast alternative to git-filter-branch - The BFG Repo-Cleaner

I recently released The BFG Repo-Cleaner, a new tool for cleansing bad data out of Git repository histories. The BFG is typically at least 10-50x faster than git-filter-branch at these tasks: * Removing Crazy Big Files from repo history * Removing Passwords, Credentials & other Private data http:

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

On Mon, 04 Feb 2013 15:40:32 -0800 Junio C Hamano wrote: JCH> "Sorry we couldn't" sounded like an error messag to me. If this is JCH> a normal exit, then please make sure it is a normal exit. OK; done in PATCHv4: removed all "Sorry" because they are not abnormal exits. I'll hold PATCHv4 until

Re: [PATCH] Verify Content-Type from smart HTTP servers

On Mon, Feb 4, 2013 at 12:38 AM, Jeff King wrote: > On Sun, Feb 03, 2013 at 11:17:33PM -0800, Junio C Hamano wrote: > > > Does this look good to both of you (relative to Shawn's patch)? > > > > remote-curl.c | 8 > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/re

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

On Mon, 4 Feb 2013 18:23:17 -0500 Jeff King wrote: >> Perhaps "-r $file", if you say "is not accessible"? JK> Even better: look at whether opening the file was successful. Though I JK> guess that is complicated by the use of gpg, who will probably not JK> distinguish ENOENT from other failures

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

Ted Zlatanov writes: >>> +my $mode = shift @ARGV; >>> + >>> +# credentials may get 'get', 'store', or 'erase' as parameters but >>> +# only acknowledge 'get' >>> +die "Syntax: $0 [-f AUTHFILE] [-d] get" unless defined $mode; >>> + >>> +# only support 'get' mode >>> +exit unless $mode eq 'get'; >

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

Jeff King writes: > On Mon, Feb 04, 2013 at 02:56:06PM -0800, Junio C Hamano wrote: > >> > +my $mode = shift @ARGV; >> > + >> > +# credentials may get 'get', 'store', or 'erase' as parameters but >> > +# only acknowledge 'get' >> > +die "Syntax: $0 [-f AUTHFILE] [-d] get" unless defined $mode; >>

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

On Mon, 04 Feb 2013 14:56:06 -0800 Junio C Hamano wrote: JCH> I recall that netrc/authinfo files are _not_ line oriented. Earlier JCH> you said "looks for entries that match" which is a lot more correct, JCH> but then we see "look for lines in authfile". Hmm, do you mean backslashed newlines?

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

Changes since PATCHv2: - don't keep looking at netrc candidates if one good one is found - fixed wording of "line" to "entry" everywhere suitable - many (but not all) statement modifiers changed to block format - use -r everywhere instead of -f - move chomp to when we know @data has contents

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

On Mon, Feb 04, 2013 at 02:56:06PM -0800, Junio C Hamano wrote: > > +my $mode = shift @ARGV; > > + > > +# credentials may get 'get', 'store', or 'erase' as parameters but > > +# only acknowledge 'get' > > +die "Syntax: $0 [-f AUTHFILE] [-d] get" unless defined $mode; > > + > > +# only support 'get

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

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

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

Ted Zlatanov writes: > JCH> I thought that we tend to avoid Emacs/Vim formatting cruft left in > JCH> the file. Do we have any in existing file outside contrib/? > > No, but it's a nice way to express the settings so no one is guessing > what the project prefers. At least for me it's not an iss

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

Ted Zlatanov writes: > Signed-off-by: Ted Zlatanov The space above your S-o-b: could be utilized a bit better ;-) > @@ -0,0 +1,236 @@ > +#!/usr/bin/perl > + > +use strict; > +use warnings; > + > +use Getopt::Long; > +use File::Basename; > + > +my $VERSION = "0.1"; > + > +my %options = ( > +

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

Signed-off-by: Ted Zlatanov --- contrib/credential/netrc/git-credential-netrc | 236 + 1 files changed, 236 insertions(+), 0 deletions(-) create mode 100755 contrib/credential/netrc/git-credential-netrc diff --git a/contrib/credential/netrc/git-credential-netrc b/con

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

On Mon, 4 Feb 2013 16:22:03 -0500 Jeff King wrote: >> Currently, we map both the "port" and "protocol" netrc tokens to the >> credential helper protocol's "protocol". So this will have undefined >> results. To do what you specify could be pretty simple: we could do a >> preliminary scan of the

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

On Mon, 4 Feb 2013 16:17:26 -0500 Jeff King wrote: JK> Do you need to quote "\n" here? Fixed. JK> Hmm, so it's not an error (just a warning) to say: JK> git credential-netrc -f /does/not/exist JK> but it is an error to say: JK> git credential-netrc JK> and have it fail to find any netr

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

On Mon, Feb 04, 2013 at 04:08:52PM -0500, Ted Zlatanov wrote: > >> That would create the following possibilities: > >> > >> * host example.com:31337, protocol https > >> * host example.com:31337, protocol unspecified > >> * host example.com, protocol https > >> * host example.com, protocol unspec

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

On Mon, Feb 04, 2013 at 02:54:30PM -0500, Ted Zlatanov wrote: > + print < + > +$0 [-f AUTHFILE] [-d] get > + > +Version $VERSION by tzz\@lifelogs.com. License: BSD. This here-doc is interpolated so you can use $0 and $VERSION, and therefore have to quote the @-sign. But later in the here-doc

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

On Mon, 4 Feb 2013 15:59:11 -0500 Jeff King wrote: JK> On Mon, Feb 04, 2013 at 03:28:52PM -0500, Ted Zlatanov wrote: JK> You might want to map this to "port" in .autoinfo separately if it's JK> available. >> >> That would create the following possibilities: >> >> * host example.com:31337, prot

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

On Mon, Feb 04, 2013 at 03:28:52PM -0500, Ted Zlatanov wrote: > JK> You might want to map this to "port" in .autoinfo separately if it's > JK> available. > > That would create the following possibilities: > > * host example.com:31337, protocol https > * host example.com:31337, protocol unspecifi

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

Jens Lehmann writes: > With "git submodule init" the user is able to tell git he cares about one > or more submodules and wants to have it populated on the next call to "git > submodule update". But currently there is no easy way he could tell git he > does not care about a submodule anymore and

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

On Mon, 4 Feb 2013 15:10:40 -0500 Jeff King wrote: JK> Technically you can speak a particular protocol on an alternate port: JK> https://example.com:31337/repo.git JK> In this case, git will send you the host as: JK> example.com:31337 JK> You might want to map this to "port" in .autoinfo

Re: [New Feature] git-submodule-move - Easily move submodules

Am 03.02.2013 23:36, schrieb TJ: > I've recently had need to re-arrange more than ten submodules within a > project and discovered there is apparently no easy way to do it. > > Using some suggestions I found on Stack Overflow I eventually figured out the > steps required. Because the steps can b

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

On Mon, Feb 04, 2013 at 12:00:34PM -0500, Ted Zlatanov wrote: > On Mon, 04 Feb 2013 17:33:58 +0100 Michal Nazarewicz > wrote: > > MN> As far as I understand, there could be a git-credential helper that > MN> reads ~/.authinfo and than git-send-email would just call “git > MN> credential fill”,

[PATCH v3] submodule: add 'deinit' command

With "git submodule init" the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to "git submodule update". But currently there is no easy way he could tell git he does not care about a submodule anymore and wants to get rid of his local w

What's cooking in git.git (Feb 2013, #02; Mon, 4)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. As usual, this cycle is expected to last for 8 to 10 weeks, with a preview -rc0 sometime in the middle of this month. You can find the changes

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

Signed-off-by: Ted Zlatanov --- contrib/credential/netrc/git-credential-netrc | 223 + 1 files changed, 223 insertions(+), 0 deletions(-) create mode 100755 contrib/credential/netrc/git-credential-netrc diff --git a/contrib/credential/netrc/git-credential-netrc b/cont

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

On Mon, 04 Feb 2013 11:06:16 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> Sorry, I didn't realize contrib/ stuff was under the same rules. JCH> I had a feeling that this may start out from contrib/ but will soon JCH> prove to be fairly important to be part of the Git proper. Cool!

Re: Bug: file named - on git commit

Junio C Hamano wrote: >(some may be too minor to be worth backproting, for > example). Yes, this is the part I was asking for help with. Backporting is easy but convincing the release team and upgrade-averse sysadmins to like the result generally isn't. Occasional nominations of the

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

Ted Zlatanov writes: > Sorry, I didn't realize contrib/ stuff was under the same rules. I had a feeling that this may start out from contrib/ but will soon prove to be fairly important to be part of the Git proper. > It would help if the requirements were codified as the fairly standard > Emacs

Re: [PATCH 3/3] Fix contrib/credentials/netrc minor issues: exit quietly; use 3-parameter open; etc.

On Mon, 04 Feb 2013 09:27:46 -0800 Junio C Hamano wrote: JCH> Ted Zlatanov writes: >> Signed-off-by: Ted Zlatanov >> --- >> contrib/credential/netrc/git-credential-netrc | 38 >> + >> 1 files changed, 20 insertions(+), 18 deletions(-) JCH> Especially because this is

Re: Segmentation fault with latest git (070c57df)

Junio C Hamano wrote: > The only case that worries me is when make or cc gets interrupted. > As long as make removes the ultimate target *.o in such a case, it > is fine to leave a half-written .depend/foo.o.d (or getting it > removed) behind. gcc removes the target .o in its signal handler in su

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

On Mon, 04 Feb 2013 09:24:03 -0800 Junio C Hamano wrote: JCH> [administrivia: I would really wish you didn't put "Mail-copies-to: JCH> never" above]. I normally post through GMane and don't need the extra CC on any list I read. I'll make an effort to remove that header here, and apologize for

Re: "git archve --format=tar" output changed from 1.8.1 to 1.8.2.1

On Sun, Feb 03, 2013 at 09:05:55PM -0800, Junio C Hamano wrote: > Greg KH writes: > > The number of people this affects right now is only one (me), given that > > the offending file is not in Linus's tree right now, so he doesn't have > > issues with uploading new releases. > > As a tree grows la

Re: Feature request: Allow extracting revisions into directories

Robert Clausecker writes: > I have a server that hosts a bare git repository. This git repository > contains a branch production. Whenever somebody pushes to production a > hook automatically puts a copy of the current production branch > into /var/www/foo. I could of course use pull for that but

Re: [PATCH 2/2] count-objects: report garbage files in .git/objects/pack directory too

Nguyễn Thái Ngọc Duy writes: > @@ -1024,11 +1035,15 @@ static void prepare_packed_git_one(char *objdir, int > local) > int namelen = strlen(de->d_name); > struct packed_git *p; > > - if (!has_extension(de->d_name, ".idx")) > + if (!has_exten

Re: Bug: file named - on git commit

Jonathan Nieder writes: >> This was fixed by Junio around 4682d85 (diff-index.c: "git diff" has no >> need to read blob from the standard input, 2012-06-27), which is >> included starting with v1.7.12 and the v1.7.11.3 maint release. Please >> upgrade. > > Should upgrade-averse folks stuck on 1.

Re: [PATCH 3/3] Fix contrib/credentials/netrc minor issues: exit quietly; use 3-parameter open; etc.

Ted Zlatanov writes: > Signed-off-by: Ted Zlatanov > --- > contrib/credential/netrc/git-credential-netrc | 38 > + > 1 files changed, 20 insertions(+), 18 deletions(-) Especially because this is an initial submission, please equash three patches into one, instead of

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

[administrivia: I would really wish you didn't put "Mail-copies-to: never" above]. Ted Zlatanov writes: > +foreach my $v (values %{$options{tmap}}) > +{ > + $options{tmap}->{$v} = $v; > +} Please follow the styles of existing Perl scripts, e.g. indent with tab, etc. Style requests are not opti

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

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) > b1c2f57 (diff_grep: use textconv buffers for add/deleted files, 20

Re: [PATCH 2/2] count-objects: report garbage files in .git/objects/pack directory too

Nguyễn Thái Ngọc Duy writes: > The hook in prepare_packed_git_one is ugly, but I don't want to > duplicate the search file logic there in count-objects. Maybe I'm > wrong. In this particular case I do not think you are completely wrong; you are probably only two thirds wrong ;-) The idea to

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

On Mon, 04 Feb 2013 17:33:58 +0100 Michal Nazarewicz wrote: MN> As far as I understand, there could be a git-credential helper that MN> reads ~/.authinfo and than git-send-email would just call “git MN> credential fill”, right? MN> I've noticed though, that git-credential does not support port

Re: [PATCH 1/3] Add contrib/credentials/netrc with GPG support

Grr, sorry for the bad formatting. First time doing format-patch. Ted -- 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: Feature request: Allow extracting revisions into directories

Andrew Ardill writes: > On 4 February 2013 23:14, Robert Clausecker wrote: >> The specific workflow I am planning is this: >> >> I have a server that hosts a bare git repository. This git repository >> contains a branch production. Whenever somebody pushes to production a >> hook automatically p

Re: Feature request: Allow extracting revisions into directories

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 archive|tar wouldn't do that. The point about removal is an interesting on

Re: Segmentation fault with latest git (070c57df)

Jeff King writes: > On Mon, Feb 04, 2013 at 01:16:08AM -0800, Junio C Hamano wrote: > >> I think this really boils down to where we draw the "this is good >> enough" line. I am not sure if losing the file as in $gmane/215211 >> is common enough to be special cased to buy us much, while leaving >

[PATCH 3/3] Fix contrib/credentials/netrc minor issues: exit quietly; use 3-parameter open; etc.

Signed-off-by: Ted Zlatanov --- contrib/credential/netrc/git-credential-netrc | 38 + 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/contrib/credential/netrc/git-credential-netrc b/contrib/credential/netrc/git-credential-netrc index a47a223..0e35918 1

[PATCH 2/3] Skip blank and commented lines in contrib/credentials/netrc

Signed-off-by: Ted Zlatanov --- contrib/credential/netrc/git-credential-netrc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/contrib/credential/netrc/git-credential-netrc b/contrib/credential/netrc/git-credential-netrc index 92fc306..a47a223 100755 --- a/contrib/cred

[PATCH 1/3] Add contrib/credentials/netrc with GPG support

Signed-off-by: Ted Zlatanov --- contrib/credential/netrc/git-credential-netrc | 242 + 1 files changed, 242 insertions(+), 0 deletions(-) create mode 100755 contrib/credential/netrc/git-credential-netrc diff --git a/contrib/credential/netrc/git-credential-netrc b/cont

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

On Sun, 3 Feb 2013 14:41:49 -0500 Jeff King wrote: JK> On Sat, Feb 02, 2013 at 06:57:29AM -0500, Ted Zlatanov wrote: >> If the file name ends with ".gpg", it will run "gpg --decrypt FILE" and >> use the output. So non-interactively, that could hang if GPG was >> waiting for input. Does Git han

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

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 all commits, and the default diff > options is the (non-existing

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

On Wed, Jan 30 2013, Jeff King wrote: > I do not mind a .netrc or .authinfo parser, because while those formats > do have security problems, they are standard files that may already be > in use. So as long as we are not encouraging their use, I do not see a > problem in supporting them (and we alre

Re: [PATCH v2] branch: show rebase/bisect info when possible instead of "(no branch)"

Matthieu Moy writes: > Just to be sure: "other" here is not a hardcoded message "bisecting > other", but an instance of "bisecting " with the branch > being called "other". OK, then I do not have any objection. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the bod

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

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 textconv buffers for add/deleted files, 2012-10-28) 0508fe5 (combine-diff: res

Re: GIT get corrupted on lustre

Hi, On 01/23/2013 01:34 PM, Sébastien Boisvert wrote: Hello, Here is a patch (with git format-patch) that removes any timer if NO_SETITIMER is set. Even with the patch, I finally got an error... :-/ Here are the log (strace -f) of a clean execution and one with the error: http://www.giref.

Re: Getting started contributing.

Junio C Hamano writes: > adamfraser writes: > >> I would like to start contributing to git and am looking for a small project >> idea to get started with. On the Small Project Ideas wiki >> site there is a >> suggestion for adding a '

Re: Getting started contributing.

adamfraser writes: > Hi, > I would like to start contributing to git and am looking for a small project > idea to get started with. On the Small Project Ideas wiki > Just to make it clear: this page is not "the official TODO-list for G

Re: [PATCH v2] branch: show rebase/bisect info when possible instead of "(no branch)"

Junio C Hamano writes: > Matthieu Moy writes: > >> Nguyễn Thái Ngọc Duy writes: >> >>> --- a/t/t6030-bisect-porcelain.sh >>> +++ b/t/t6030-bisect-porcelain.sh >>> @@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing >>> ".git/BISECT_START" not modified if >>> cp .git/BISECT_STAR

Re: Feature request: Allow extracting revisions into directories

On 4 February 2013 23:14, Robert Clausecker wrote: > The specific workflow I am planning is this: > > I have a server that hosts a bare git repository. This git repository > contains a branch production. Whenever somebody pushes to production a > hook automatically puts a copy of the current produ

[PATCH 2/2] count-objects: report garbage files in .git/objects/pack directory too

While it's unusual to have strange files in loose object database, .git/objects/pack/tmp_* is normal after a broken fetch and they can eat up a lot of disk space if the user does not pay attention. Report them. Signed-off-by: Nguyễn Thái Ngọc Duy --- The hook in prepare_packed_git_one is ugly, b

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

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(+

Re: Feature request: Allow extracting revisions into directories

On Mon, 04 Feb 2013 13:14:05 +0100, Robert Clausecker wrote: > Of course that is a possibility but it does not not feel right and is > not intuitive. Adding this feature won't cause feature creep but would > rather add an operation that makes sense in some scenarios and reduces > the dependencies

Re: Feature request: Allow extracting revisions into directories

Am Montag, den 04.02.2013, 12:18 +0100 schrieb Michael J Gruber: > Sitaram has said much about the Unix philosophy already, and Konstantin > gave a variant of checkout. Just two more cents: > > How would you copy a directory tree? I presume you wouldn't use "tar c . > | tar -xC gothere", but what

Re: Feature request: Allow extracting revisions into directories

Robert Clausecker venit, vidit, dixit 03.02.2013 15:18: > Hello! > > git currently has the archive command that allows to save an arbitrary > revision into a tar or zip file. Sometimes it is useful to not save this > revision into an archive but to directly put all files into an arbitrary > direct

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

Junio C Hamano venit, vidit, dixit 04.02.2013 00:10: > I think a natural way to ask reviewing the recent merges while > showing tricky ones would be to say: > > $ git log --first-parent --cc master..pu > > But this does not to show what I expect to see, which is an output > of: > > $

Re: Segmentation fault with latest git (070c57df)

On Mon, Feb 04, 2013 at 01:29:41AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > As I understand how the current set-up works: > > > > * Initially, we do not have foo.o but foo.c. We automatically > >build foo.o because it depends on foo.c via the "%.o : %.c" rule, > >and

Re: Segmentation fault with latest git (070c57df)

On Mon, Feb 04, 2013 at 01:16:08AM -0800, Junio C Hamano wrote: > I think this really boils down to where we draw the "this is good > enough" line. I am not sure if losing the file as in $gmane/215211 > is common enough to be special cased to buy us much, while leaving > other ".depend/foo.o.d wa

Re: Segmentation fault with latest git (070c57df)

Junio C Hamano writes: > As I understand how the current set-up works: > > * Initially, we do not have foo.o but foo.c. We automatically >build foo.o because it depends on foo.c via the "%.o : %.c" rule, >and as a side effect, we also build .depend/foo.o.d file; > > * Then, if any real

Re: Segmentation fault with latest git (070c57df)

Jeff King writes: > Do we want to do anything with the other dependency hole I found here: > > http://article.gmane.org/gmane.comp.version-control.git/215211 > > It's definitely a potential problem, but I don't think we have any > reports of it happening in practice, so it might not be worth wo

Re: Getting started contributing.

Thanks for all of the replies. I'll have a look into the suggestions and try to find somewhere I can help out. :) -- View this message in context: http://git.661346.n2.nabble.com/Getting-started-contributing-tp7576834p7576901.html Sent from the git mailing list archive at Nabble.com. -- To unsu

Re: [PATCH] Verify Content-Type from smart HTTP servers

On Sun, Feb 03, 2013 at 11:17:33PM -0800, Junio C Hamano wrote: > Does this look good to both of you (relative to Shawn's patch)? > > remote-curl.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/remote-curl.c b/remote-curl.c > index e6f3b63..933c69a 100644 > --

Re: Segmentation fault with latest git (070c57df)

On Sun, Feb 03, 2013 at 11:13:00PM -0800, Junio C Hamano wrote: > Yeah, that result is understandable, as .depend/*.o.d files will not > be rebuilt when the rules to build them changes in the Makefile. > Applying the patch to the Makefile in the pristine old tree, run the > build (which will gener