[PATCH] git-bisect.txt: clarify that reset finishes bisect

2013-02-09 Thread Michael J Gruber
"reset" can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually finishes the bisect session. Reported-by: Andreas Mohr Signed-off-by: Michael J Gruber --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 inser

Re: [PATCH] git-bisect.txt: clarify that reset finishes bisect

2013-02-11 Thread Michael J Gruber
Jonathan Nieder venit, vidit, dixit 10.02.2013 02:49: > Hi, > > Michael J Gruber wrote: > >> "reset" can be easily misunderstood as resetting a bisect session to its >> start without finishing it. Clarify that it actually finishes the bisect >> session. &

[PATCHv2] git-bisect.txt: clarify that reset quits bisect

2013-02-11 Thread Michael J Gruber
"reset" can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually quits the bisect session. Reported-by: Andreas Mohr Signed-off-by: Michael J Gruber --- Documentation/git-bisect.txt | 7 ++- 1 file changed, 6 insert

Re: Pushing a git repository to a new server

2013-02-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.02.2013 17:27: > On Mon, Feb 11, 2013 at 02:57:51AM -0500, Ethan Reesor wrote: > >> On Mon, Feb 11, 2013 at 2:50 AM, Konstantin Khomoutov >> wrote: >>> What's wrong with >>> $ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare' >>> $ git push

Re: Pushing a git repository to a new server

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

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

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

[PATCH 0/5] gpg_interface: use the status

2013-02-14 Thread Michael J Gruber
important for assigning trust. All existing tests pass with this. BTW: git branch --set-upstream-to= coredumps when on a detached head. Michael J Gruber (5): gpg-interface: check good signature in a reliable way log-tree: rely upon the check in the gpg_interface gpg_interface: allow to request

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

2013-02-14 Thread Michael J Gruber
is the only reliable way of checking for a good gpg signature. If needed we can change this easily to "[GNUPG:] VALIDSIG " if we want to take into account the trust model. Signed-off-by: Michael J Gruber --- gpg-interface.c | 13 +++-- 1 file changed, 11 insertions(+), 2

[PATCH 2/5] log-tree: rely upon the check in the gpg_interface

2013-02-14 Thread Michael J Gruber
It's just so much betterer. Signed-off-by: Michael J Gruber --- log-tree.c | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/log-tree.c b/log-tree.c index 5dc45c4..912fe08 100644 --- a/log-tree.c +++ b/log-tree.c @@ -508,20 +508,17 @@ static

[PATCH 3/5] gpg_interface: allow to request status return

2013-02-14 Thread Michael J Gruber
Currently, verify_signed_buffer() returns the user facing output only. Allow callers to request the status output also. Signed-off-by: Michael J Gruber --- builtin/fmt-merge-msg.c | 2 +- builtin/verify-tag.c| 2 +- gpg-interface.c | 11 +++ gpg-interface.h | 2

[PATCH 4/5] pretty: parse the gpg status lines rather than the output

2013-02-14 Thread Michael J Gruber
committer names. Signed-off-by: Michael J Gruber --- pretty.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pretty.c b/pretty.c index 2a1e174..973b912 100644 --- a/pretty.c +++ b/pretty.c @@ -759,6 +759,7 @@ struct format_commit_context { unsigned

[PATCH 5/5] pretty: make %GK output the signing key for signed commits

2013-02-14 Thread Michael J Gruber
Because we can. No, really: In order to employ signed keys in an automated way it is absolutely necessary to check which keys the signatures come from. Now you can. Signed-off-by: Michael J Gruber --- Documentation/pretty-formats.txt | 1 + pretty.c | 9 - 2

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

2013-02-14 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 14.02.2013 16:36: > The old Git version where it appeared is not useful only to historians, > not to normal users. Also, the text was mentioning only the per-repo I do not think you meant to not remove so many nots ;) Besides, if history is uninteresting, then so

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 writes: > >> Junio C Hamano 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 documentation. >> >> I'm OK with you

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

Re: [PATCH] l10n: de.po: translate 35 new messages

2013-02-19 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 18.02.2013 19:22: > Translate 35 new messages came from git.pot update > in 9caaf23 (l10n: Update git.pot (35 new, 14 removed > messages)). > > Signed-off-by: Ralf Thielow > --- > po/de.po | 140 > +++ >

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Michael J Gruber
Scott Chacon venit, vidit, dixit 18.02.2013 22:29: > Right now we have: > > Dev day: 50 > User day: 295 > Hack day: 200 > > I'm not sure what the actual turnout will be, but it looks like it's > going to be pretty massive. I wanted to go through the Dev day > signups and figure out if everyone r

Re: Git Merge 2013 Conference, Berlin

2013-02-19 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: > Scott Chacon venit, vidit, dixit 18.02.2013 22:29: >> Right now we have: >> >> Dev day: 50 >> User day: 295 >> Hack day: 200 >> >> I'm not sure what the actual turnout will be, but it looks

Re: Git Merge 2013 Conference, Berlin

2013-02-20 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 20.02.2013 00:47: > Scott Chacon writes: > >> Junio, are you interested in attending? > > I am interested in meeting our European contributors, but Berlin is > kind of very far, so give me a few days to think about it. > > Thanks. > Maybe, we can - for the ne

RFD: concatening textconv filters

2013-02-21 Thread Michael J Gruber
During my day-to-day UGFWIINIT I noticed that we don't do textconv iteratively. E.g.: I have a file SuperSecretButDumbFormat.pdf.gpg and textconv filters with attributes set for *.gpg and *.pdf (using "gpg" resp. "pdftotext"). For Git, the file has only the "gpg" attribute, of course. In this cas

Re: clean/smudge filters on .zip/.tgz files

2013-02-27 Thread Michael J Gruber
Johannes Sixt venit, vidit, dixit 27.02.2013 07:39: > Am 2/26/2013 23:38, schrieb Tim Chase: >> Various programs that I use ([Open|Libre]Office, Vym, etc) use a >> zipped/.tgz'ed file format, usually containing multiple >> (usually) plain-text files within. >> >> I'm trying to figure out a way for

Re: Ignore version update changes on git show report?

2013-03-01 Thread Michael J Gruber
Preben Liland Madsen venit, vidit, dixit 26.02.2013 20:53: > Hello, > > I'm trying to investigate some what changes have been done between two > versions of a software with the name IP.Board. > > This proves more troublesome than I thought, since their release builder > appearantly updates th

Re: [PATCH] help: show manpage for aliased command on git --help

2013-03-06 Thread Michael J Gruber
Jeff King venit, vidit, dixit 05.03.2013 18:38: > On Tue, Mar 05, 2013 at 02:44:41PM +, Ævar Arnfjörð Bjarmason wrote: > >> Change the semantics of "git --help" to show the help for the >> command is aliased to, instead of just saying: >> >> `git ' is aliased to `' >> >> E.g. if you have

Re: Textconv

2013-03-11 Thread Michael J Gruber
Dmitry Ilin venit, vidit, dixit 11.03.2013 12:30: > I tried this command and I got following result: > > trace: built-in: git 'show' 'a1bffde' > trace: run_command: 'openssl enc -d -base64 -aes-256-ecb -k > '\''abcde'\'' 2> /dev/null || cat' > trace: exec: 'sh' '-c' 'openssl enc -d -base64 -aes-2

Re: [PATCH] tag: --force is quiet about new tags

2013-03-13 Thread Michael J Gruber
Phil Hord venit, vidit, dixit 13.03.2013 05:21: > On Tue, Mar 12, 2013 at 11:33 PM, Junio C Hamano wrote: >> Phil Hord writes: >> >>> git tag --force is used to replace an existing tag with >>> a new reference. Git helpfully tells the user the old >>> ref when this happens. But if the tag name

<    4   5   6   7   8   9