[PATCH] release notes: typo fixes

2014-02-13 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Just a few things I spotted while trying to keep myself informed :) Documentation/RelNotes/1.9.txt | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Documentation/RelNotes/1.9

Re: __git_ps1_colorize__gitstring() in git_prompt.sh: colors are hardcoded?

2014-10-20 Thread Michael J Gruber
nathdwek schrieb am 17.10.2014 um 19:30: Hello, It seems to me that the colors used to indicate the repo's state in the prompt are hardcoded although the top comment says otherwise. From contrib/completion/git-contrib.sh: [83]# If you would like a colored hint about the current dirty

Re: Sources for 3.18-rc1 not uploaded

2014-10-21 Thread Michael J Gruber
Linus Torvalds schrieb am 21.10.2014 um 01:17: On Mon, Oct 20, 2014 at 3:28 PM, brian m. carlson sand...@crustytoothpaste.net wrote: It doesn't appear that the stability of git archive --format=tar is documented anywhere. Given that, it doesn't seem reasonable to expect that any tar

Re: please document --cached option to git-difftool

2014-10-21 Thread Michael J Gruber
Joseph Nahmias schrieb am 20.10.2014 um 23:24: Hello, It would be great if the documentation showed that the git-difftool(1) command accepted the --cached option. You can probably steal appropriate verbiage from the git-diff(1) manpage. $ git --version git version 2.1.1 Thanks,

Re: Sources for 3.18-rc1 not uploaded

2014-10-22 Thread Michael J Gruber
Junio C Hamano schrieb am 21.10.2014 um 20:14: Michael J Gruber g...@drmicha.warpmail.net writes: Unfortunately, the git archive doc clearly says that the umask is applied to all archive entries. Is an extended pax header an archive entry? I doubt it, and the above is not relevant

[RFD/PATCH] push: heed user.signingkey for signed pushes

2014-10-22 Thread Michael J Gruber
push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Interestingly, when I wrote the test I had the impression that user.email is not heeded either - or do we have

[PATCHv2] push: heed user.signingkey for signed pushes

2014-10-22 Thread Michael J Gruber
push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Okay, I guess this is nicer. We do have the committer info in the env. Sorry. builtin/push.c | 13

[PATCH 0/2] document signature formats

2014-10-22 Thread Michael J Gruber
This is a first shot at documenting the various signatures that we use in a technical document. If something like this is deemed useful I should probably recreate the sample signatures using our testlib keys and users in a v2. Michael J Gruber (2): Documentation/technical: signature formats

[PATCH 2/2] Documentation/technical: document push certificate format

2014-10-22 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/technical/signature-format.txt | 35 1 file changed, 35 insertions(+) diff --git a/Documentation/technical/signature-format.txt b/Documentation/technical/signature-format.txt index 80f0a47

[PATCH 1/2] Documentation/technical: signature formats

2014-10-22 Thread Michael J Gruber
Various formats for storing signatures have accumulated by now. Document them to keep track (and maybe avoid yet another one). Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/Makefile | 1 + Documentation/technical/signature-format.txt | 126

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 23.10.2014 um 00:05: Michael J Gruber g...@drmicha.warpmail.net writes: push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Okay, I guess

Re: [PATCHv2] push: heed user.signingkey for signed pushes

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 23.10.2014 um 01:47: Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: push --signed promises to take user.signingkey as the signing key but fails to read the config. Make it do so. Signed-off-by: Michael J Gruber g

[PATCH] t/lib-gpg: make gpghome files writable

2014-10-24 Thread Michael J Gruber
t/lib-gpg.sh copies the test environment's gpg home to the trash directory and makes sure the directoty is writable. Make sure the copied files are writable, too. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/lib-gpg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/lib

Re: [PATCH 1/2] Documentation/technical: signature formats

2014-10-24 Thread Michael J Gruber
Junio C Hamano schrieb am 22.10.2014 um 21:02: Michael J Gruber g...@drmicha.warpmail.net writes: Various formats for storing signatures have accumulated by now. Document them to keep track (and maybe avoid yet another one). I haven't looked at the description closely, but it is a good

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-27 Thread Michael J Gruber
David Aguilar schrieb am 27.10.2014 um 02:10: On Sun, Oct 26, 2014 at 05:41:49PM -0700, David Aguilar wrote: On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote: An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does not quit it, but is treated as if 'yes' was

Re: [PATCH 1/2] Documentation/technical: signature formats

2014-10-30 Thread Michael J Gruber
Jakub Narębski schrieb am 25.10.2014 um 10:30: W dniu 2014-10-22 21:02, Junio C Hamano pisze: A mergetag is not fundamentally a signature in the above sense, though. It is just a dump of the object content in a regular object header field (hence indented by one SP), and its contents having

Re: [PATCH] line-log: fix crash when --first-parent is used

2014-11-04 Thread Michael J Gruber
Tzvetan Mikov schrieb am 03.11.2014 um 23:09: On Mon, Nov 3, 2014 at 12:58 PM, Junio C Hamano gits...@pobox.com wrote: line-log tries to access all parents of a commit, but only the first parent has been loaded if --first-parent is specified, resulting in a crash. Limit the number of

[RFC/PATCH] rebase -i: use full onto sha1 in reflog

2012-08-09 Thread Michael J Gruber
sha1, as well. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I don't remember having sent this out before but have been running with it since (including tests). I don't see it on the list either. While not for 1.7.12 obviously, it might still be good to have. git-rebase

Re: The GitTogether

2012-08-09 Thread Michael J Gruber
Michael J Gruber venit, vidit, dixit 30.07.2012 15:17: Jens Lehmann venit, vidit, dixit 29.07.2012 17:55: Am 27.07.2012 13:45, schrieb Thomas Rast: Scott Chacon scha...@gmail.com writes: GitHub would like to volunteer to organize and pay for these events this year. I would like to hold

[PATCHv2] rebase -i: use full onto sha1 in reflog

2012-08-10 Thread Michael J Gruber
sha1, as well. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- So, this is without the now superfluous shortonto definition. The other place where shortonto is defined is still needed. git-rebase--interactive.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[RFC/PATCH] blame: simplify algorithm

2012-09-05 Thread Michael J Gruber
Recent research (http://tirania.org/blog/archive/2012/Aug-29.html) resulted in a simplified algorithm for assigning blame in foss projects. Make git blame use that algorithm by default. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I've updated the man page for 'git annotate

[PATCH 0/3] pre-merge-hook

2012-09-05 Thread Michael J Gruber
-commit hook is not run by git merge. Introduce a pre-merge hook which works for (non ff, automatic) merges like pre-commit does for commits. Typically this will just call the pre-commit hook (like in the sample hook), but it does not need to. Michael J Gruber (3): git-merge: Honor pre-merge hook

[PATCH 1/3] git-merge: Honor pre-merge hook

2012-09-05 Thread Michael J Gruber
). Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/githooks.txt| 7 +++ builtin/merge.c | 13 - templates/hooks--pre-merge.sample | 13 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 templates

[PATCH 2/3] merge: --no-verify to bypass pre-merge hook

2012-09-05 Thread Michael J Gruber
Analogous to commit, introduce a '--no-verify' option which bypasses the pre-merge hook. The shorthand '-n' is taken by the (non-existing) '--no-stat' already. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-merge.txt | 2 +- Documentation/githooks.txt

[PATCH 3/3] t7503: add tests for pre-merge-hook

2012-09-05 Thread Michael J Gruber
Add tests which make sure that the pre-merge-hook is called when present, allows/disallows merge commits depending on its return value and is suppressed by --no-verify. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7503-pre-commit-hook.sh | 66

Re: [PATCH 0/3] pre-merge-hook

2012-09-06 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.09.2012 07:07: Michael J Gruber g...@drmicha.warpmail.net writes: The pre-commit hook is often used to ensure certain properties of each comitted tree like formatting or coding standards, validity (lint/make) or code quality (make test). But merges

Re: [PATCH 1/3] git-merge: Honor pre-merge hook

2012-09-06 Thread Michael J Gruber
Michael Haggerty venit, vidit, dixit 05.09.2012 17:30: On 09/05/2012 03:39 PM, Michael J Gruber wrote: git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called

[PATCHv2 0/4] pre-commit hook for merges

2012-09-06 Thread Michael J Gruber
to true, of course... [I had messed up my alias file when adding mhagger, and it seems that tripped up vger; resending, sorry.] Michael J Gruber (4): merge: document prepare-commit-msg hook usage git-merge: Honor pre-commit hook based on config merge: --no-verify to bypass pre-commit hook

[PATCHv2 1/4] merge: document prepare-commit-msg hook usage

2012-09-06 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-merge.txt | 5 + Documentation/githooks.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 20f9228..b3ba8a8 100644 --- a/Documentation/git

[PATCHv2 2/4] git-merge: Honor pre-commit hook based on config

2012-09-06 Thread Michael J Gruber
git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a merge.usePreCommitHook which controls whether an automatic merge commit invokes pre-commit. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net

[PATCHv2 3/4] merge: --no-verify to bypass pre-commit hook

2012-09-06 Thread Michael J Gruber
Analogous to commit, introduce a '--no-verify' option which bypasses the pre-commit hook. The shorthand '-n' is taken by the (non-existing) '--no-stat' already. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-merge.txt | 2 +- Documentation/githooks.txt

[PATCHv2 4/4] t7503: add tests for pre-commit hook (merge)

2012-09-06 Thread Michael J Gruber
Add tests which make sure that the pre-commit hook is called by 'git merge' when merge.usePreCommitHook is set, allows/disallows merge commits depending on its return value and is suppressed by --no-verify. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7503-pre-commit-hook.sh

Re: [PATCH] doc: move rev-list option -n from git-log.txt to rev-list-options.txt

2012-09-07 Thread Michael J Gruber
Nguyễn Thái Ngọc Duy venit, vidit, dixit 06.09.2012 16:28: rev-list-options.txt is included in git-rev-list.txt. This makes sure rev-list man page also shows that, and at one place, together with equivalent options -n and --max-count. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com

Re: [PATCH 0/3] pre-merge-hook

2012-09-07 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 06.09.2012 20:34: Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 06.09.2012 07:07: Michael J Gruber g...@drmicha.warpmail.net writes: The pre-commit hook is often used to ensure certain properties of each comitted

[PATCH] completion: git branch --set-upstream-to=

2012-09-11 Thread Michael J Gruber
Remove the deprecated --set-upstream from completion suggestions and add the new --set-upstream-to=, offering all refs for completion like in similar cases. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- contrib/completion/git-completion.bash | 5 - 1 file changed, 4

[PATCH 0/2] git describe --first-parent

2012-09-11 Thread Michael J Gruber
? (This branch being defined as --first-parent walk.) I had suggested this before, but the discussion veered off quite a bit: http://permalink.gmane.org/gmane.comp.version-control.git/156811 No need to discuss the way git describe behaves again ;) Michael J Gruber (2): git-describe: introduce

[PATCH 2/2] describe: document and test --first-parent

2012-09-11 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/git-describe.txt | 16 +++- t/t6120-describe.sh| 7 +++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index

[PATCH 1/2] git-describe: introduce --first-parent

2012-09-11 Thread Michael J Gruber
git describe --contains --first-parent is forbidden because git name-rev (which is called by that) favors first-parent transversal already, although not strictly so. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/describe.c | 8 +++- 1 file changed, 7 insertions(+), 1

[PATCH] rev-list/log: document logic with several limiting options

2012-09-11 Thread Michael J Gruber
The current behavior is probably as useful as it is confusing. In any case it is going to stay. So, document it. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I would have written a test but don't really know where to stick it in. rev-list has many small tests where it doesn't fit

Re: [PATCH] completion: git branch --set-upstream-to=

2012-09-12 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 11.09.2012 19:13: Thanks; I picked up $gmane/204633 but forgot to queue. I missed that one, thanks for reducing appropriately. Michael -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH] rev-list/log: document logic with several limiting options

2012-09-12 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 11.09.2012 18:22: Michael J Gruber g...@drmicha.warpmail.net writes: The current behavior is probably as useful as it is confusing. In any case it is going to stay. So, document it. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I would

Re: [PATCH] rev-list/log: document logic with several limiting options

2012-09-13 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 12.09.2012 19:25: Michael J Gruber g...@drmicha.warpmail.net writes: It was introduced in 0ab7befa with a clear meaning (AND everything), then the general logic (without --all-match) was modified in 80235ba7 (to take headermatch AND (all greps ORed

[PATCHv2 0/6] rev-list/log: document logic with several limiting options

2012-09-13 Thread Michael J Gruber
failure: 'git log --all-match --author=me --grep=foo --grep=bar' does not AND the greps (whereas it does without --author). I don't describe this corner case in the doc patch. Michael J Gruber (6): t7810-grep: bring log --grep tests in common form t7810-grep: test multiple --grep

[PATCHv2 1/6] t7810-grep: bring log --grep tests in common form

2012-09-13 Thread Michael J Gruber
The log --grep tests generate the expected out in different ways. Make them all use command blocks so that subshells are avoided and the expected output is easier to grasp visually. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 24 ++-- 1

[PATCHv2 3/6] t7810-grep: test multiple --author with --all-match

2012-09-13 Thread Michael J Gruber
--all-match is ignored for author matching on purpose. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 1db3dcb..9bc63a3 100755 --- a/t/t7810-grep.sh +++ b/t/t7810

Re: [PATCHv2 3/6] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.09.2012 01:26: Junio C Hamano gits...@pobox.com writes: One possible improvement we can make is to parse the command line in the last example with --all-match to [all-match] (or pattern_bodybodycommit (or pattern_bodybodytag

[PATCHv3 02/11] log: name --debug-grep option like in the commit message

2012-09-14 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- revision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.c b/revision.c index 90376e8..fad8040 100644 --- a/revision.c +++ b/revision.c @@ -1578,7 +1578,7 @@ static int handle_revision_opt(struct

[PATCHv3 04/11] log --grep/--author: honor --all-match honored for multiple --grep patterns

2012-09-14 Thread Michael J Gruber
. The all-match logic inspects the same nodes in pattern as the case without the author and/or the committer restriction. Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- grep.c | 19 +++ 1 file changed, 19 insertions

[PATCHv3 05/11] log: document use of multiple commit limiting options

2012-09-14 Thread Michael J Gruber
From: Junio C Hamano gits...@pobox.com Generally speaking, using more options will further narrow the selection, but there are a few exceptions. Document them. Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/rev-list

[PATCHv3 06/11] fixup! log: document use of multiple commit limiting options

2012-09-14 Thread Michael J Gruber
Here are a few typo fixes. There is a mix of single and back ticks already before this patch, i.e. ` vs. ' -- I thought we had guidelines for this but don't find them at the moment. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/rev-list-options.txt | 12

[PATCHv3 03/11] grep: show --debug output only once

2012-09-14 Thread Michael J Gruber
When threaded grep is in effect, the patterns are duplicated and recompiled for each thread. Avoid --debug output during the recompilation so that the output is given once instead of 1+nthreads times. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/grep.c | 1 + 1 file

[PATCHv3 08/11] t7810-grep: test multiple --grep with and without --all-match

2012-09-14 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 180e998..b841909 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -479,6 +479,22 @@ test_expect_success

[PATCHv3 10/11] t7810-grep: test interaction of multiple --grep and --author options

2012-09-14 Thread Michael J Gruber
There are tests for this interaction already. Restructure slightly and avoid any claims about --all-match. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/t

[PATCHv3 11/11] t7810-grep: test --all-match with multiple --grep and --author options

2012-09-14 Thread Michael J Gruber
--all-match is ignored with multiple author options on purpose but requires all --grep to be matched on some line. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810

[PATCHv3 09/11] t7810-grep: test multiple --author with --all-match

2012-09-14 Thread Michael J Gruber
--all-match is ignored for author matching on purpose. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index b841909..be81d96 100755 --- a/t/t7810-grep.sh +++ b/t/t7810

[PATCHv3 07/11] t7810-grep: bring log --grep tests in common form

2012-09-14 Thread Michael J Gruber
The log --grep tests generate the expected out in different ways. Make them all use command blocks so that subshells are avoided and the expected output is easier to grasp visually. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t7810-grep.sh | 24 ++-- 1

Re: [PATCH RFC 0/2] Mixing English and a local language

2012-09-14 Thread Michael J Gruber
Jeff King venit, vidit, dixit 13.09.2012 20:00: On Thu, Sep 13, 2012 at 10:30:52AM -0700, Junio C Hamano wrote: But it should not be per-command, but per-message, and should include all output that is not diagnostic and is not machine-parseable (e.g., what I mentioned above,

Re: What's the point of saying HEAD is now at ...?

2012-09-14 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.09.2012 07:14: I sometimes wonder what value the message is giving us. For example, while reviewing a patch in my Emacs session, I may say | git am -s3c RETURN which runs the command on the contents of the e-mail I am reading, to apply the

Re: Using Format/export-subst Howto.

2012-09-14 Thread Michael J Gruber
Mestnik, Michael J - Eagan, MN - Contractor venit, vidit, dixit 14.09.2012 14:20: I must have missed something reading through the documentation for this. git version 1.7.11.3 $ git check-attr -a -- autorepair.d/AR02_new_rttest.sh autorepair.d/AR02_new_rttest.sh: ident: set

Re: [PATCH] Makefile: respect $LINGUAS variable on selecting .mo files to install

2012-09-14 Thread Michael J Gruber
Nguyễn Thái Ngọc Duy venit, vidit, dixit 14.09.2012 14:40: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- On Fri, Sep 14, 2012 at 6:35 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: We should honor LINGUAS variable on installation. Only languages listed in that variable

Re: Using Format/export-subst Howto.

2012-09-17 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 14.09.2012 23:23: Michael J Gruber g...@drmicha.warpmail.net writes: you need to rm file git checkout file). If the user has to update $Id$ to match the current sha1 (by remembering to do a more forceful checkout than checkout -f) then one half

Re: Using Format/export-subst Howto.

2012-09-17 Thread Michael J Gruber
Mestnik, Michael J - Eagan, MN - Contractor venit, vidit, dixit 17.09.2012 16:08: -Original Message- From: Michael J Gruber [mailto:g...@drmicha.warpmail.net] Sent: Monday, September 17, 2012 8:45 AM To: Mestnik, Michael J - Eagan, MN - Contractor Cc: Junio C Hamano; Johannes Sixt

Re: Using Format/export-subst Howto.

2012-09-18 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 17.09.2012 22:21: Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 15.09.2012 00:26: Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: you need to rm file git checkout file

Re: Quickly searching for a note

2012-09-23 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 22.09.2012 22:23: Michael J Gruber g...@drmicha.warpmail.net writes: On my mental scratch pad (yeah, that's where the bald spots are) I have the following more general idea to enhance the revision parser: --limit-run=script:: --run=script

GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
[mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel /home/mjg [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel fatal: Not a git repository: '~/.githome' Huh? Ok, so most users probably would not try further and blame git, but: [mjg@localhost ~]$ git

Re: Message from 'git-rebase'; German translation

2012-09-24 Thread Michael J Gruber
Sascha Cunz venit, vidit, dixit 22.09.2012 23:57: As I know how hard translations can be, esp. with that much technical terms inside, I'm usually expecting _not_ to yield the same result when translating a software's translation back to English. However, git-rebase just threw these two

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Nguyen Thai Ngoc Duy venit, vidit, dixit 24.09.2012 09:41: On Mon, Sep 24, 2012 at 2:19 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel /home/mjg [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Nguyen Thai Ngoc Duy venit, vidit, dixit 24.09.2012 11:53: On Mon, Sep 24, 2012 at 2:57 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: It might be difficult to implement, but I'm sorry I can't follow the argumentation above at all; it's not based on what we do in other places and other

[RFC/PATCH] git: expand user path in --git-dir

2012-09-24 Thread Michael J Gruber
undergo tilde expansion as well. We don't do this for any environment variable yet, so I didn't go that far. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- git.c | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/git.c b/git.c index 8788b32

Re: [RFC] Questions for Git User's Survey 2011

2012-09-24 Thread Michael J Gruber
Jakub Narębski venit, vidit, dixit 23.09.2012 00:45: On Wed, Sep 19, 2012 at 7:35 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, On Wed, Sep 14, 2011 at 7:39 PM, Jakub Narebski jna...@gmail.com wrote: P.S. Would you be interested in running the next survey? I haven't seen any

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 24.09.2012 16:36: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: ~ is a shell feature. Know your shell. If we make an exception for --git-dir, we might have to support --blahblah=~/somewhere. Correct but not entirely true. When we know --git-dir=path

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Jeff King venit, vidit, dixit 24.09.2012 16:49: On Mon, Sep 24, 2012 at 09:19:27AM +0200, Michael J Gruber wrote: [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel /home/mjg [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel fatal: Not a git repository

Re: [RFC/PATCH] git: expand user path in --git-dir

2012-09-24 Thread Michael J Gruber
Jeff King venit, vidit, dixit 24.09.2012 16:52: On Mon, Sep 24, 2012 at 02:57:20PM +0200, Michael J Gruber wrote: Currently, all paths in the config file are subject to tilde expansion for user paths while the argument to --git-dir is not expanded, and neither are paths in the environment

Re: Quickly searching for a note

2012-09-25 Thread Michael J Gruber
Jeff King venit, vidit, dixit 25.09.2012 02:42: On Sun, Sep 23, 2012 at 05:07:04PM +0200, Michael J Gruber wrote: If we linked with an embeddable scripting language interpreter (e.g. lua, tcl, guile, ...), it may be a more practical enhancement, though. Yes, the idea is extend, don't

Re: [RFC/PATCH] git: expand user path in --git-dir

2012-09-25 Thread Michael J Gruber
Jan Engelhardt venit, vidit, dixit 25.09.2012 07:33: On Monday 2012-09-24 14:57, Michael J Gruber wrote: Currently, all paths in the config file are subject to tilde expansion for user paths while the argument to --git-dir is not expanded, and neither are paths in the environment

Re: DWIM .git repository discovery

2012-09-26 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 26.09.2012 06:21: Nguyen Thai Ngoc Duy pclo...@gmail.com writes: I often find myself attempting to examine another repository, especially in projects that are closely related but put in different git repos. It's usually just a diff or log command git log

Re: bash completion with colour hints

2012-09-27 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 27.09.2012 08:53: Simon Oosthoek soosth...@nieuwland.nl writes: I read the guide and now I have some questions: - It suggests to use the oldest commit that contains the bug and can support the fix. This would be the very first mention of __git_ps1

Re: [PATCH] Add __git_ps1_pc to use as PROMPT_COMMAND

2012-10-02 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 01.10.2012 23:09: Simon Oosthoek s.oosth...@xs4all.nl writes: It's possible to set PS1 to nothing and print a string from PROMPT_COMMAND, but then you miss out on all the features of the PS1 interpretation by bash and compared to the use of __git_ps1 at the

[PATCH] RelNotes/1.8.0: various typo and style fixes

2012-10-02 Thread Michael J Gruber
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Just trying to make it clearer, and threw in an article or two. Also, tried to make the use of tenses a bit more uniform. As always, best looked at with --color-words or such. Documentation/RelNotes/1.8.0.txt | 48

Re: [PATCH/RFC] svn test: escape peg revision separator using empty peg rev

2012-10-09 Thread Michael J Gruber
Jonathan Nieder venit, vidit, dixit 09.10.2012 10:41: This test script uses svn cp to create a branch with an @-sign in its name: svn cp pr ject/trunk pr ject/branches/not-a@{0}reflog That sets up for later tests that fetch the branch and check that git svn mangles the refname

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Sorry for being late ($DAYJOB and such), but I just noticed this is on next already: Simon Oosthoek venit, vidit, dixit 05.10.2012 23:10: By setting GIT_PS1_SHOW_COLORHINTS when using __git_ps1 as PROMPT_COMMAND, you will get color hints in addition to a different character (*+% etc.)

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Simon Oosthoek venit, vidit, dixit 15.10.2012 11:01: On 10/15/2012 10:23 AM, Michael J Gruber wrote: Sorry for being late ($DAYJOB and such), but I just noticed this is on next already: + if [ -n ${GIT_PS1_SHOWCOLORHINT-} ]; then You're missing the S here (HINTS

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Simon Oosthoek venit, vidit, dixit 15.10.2012 15:20: Hi Michael, sorry for the duplicate, forgot to reply-all... On 10/15/2012 11:13 AM, Michael J Gruber wrote: ...only because you don't know the color coding scheme. It's green because those changes are saved somewhere (in the index

Re: [Patch 3/5] Create html documents for all files in Documentation/RelNotes

2012-10-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 07.10.2012 22:53: Jeff King p...@peff.net writes: [1] I would not be surprised if they do not actually format all that well. Though they are written in an asciidoc-ish style, they have not traditionally been formatted, and I suspect there are many

Re: [Patch 0/5] Create single PDF for all HTML files

2012-10-15 Thread Michael J Gruber
Jeff King venit, vidit, dixit 08.10.2012 00:52: On Sun, Oct 07, 2012 at 10:14:28AM +0200, Thomas Ackermann wrote: There are patched QT and unpatched QT versions of wkhtmltopdf (see http://code.google.com/p/wkhtmltopdf/). I am using V0.9.9 for Windows which is patched QT. That's a definite

Re: build deps

2012-10-15 Thread Michael J Gruber
Thiago Farina venit, vidit, dixit 12.10.2012 06:08: On Thu, Oct 11, 2012 at 10:06 PM, Andrew Wong andrew.kw.w.li...@gmail.com wrote: On 10/11/12 16:54, Thiago Farina wrote: Just setting CC to gcc works for me. But still, I'd like to be able to build with clang (may be as you noted is just

Re: Planning to pass the baton to an interim maintainer

2012-10-15 Thread Michael J Gruber
Jeff King venit, vidit, dixit 15.10.2012 07:56: On Sun, Oct 14, 2012 at 11:23:07AM -0700, Junio C Hamano wrote: I am planning to * tag 1.8.0 final on Oct 21st (Sun); * go offline on Oct 22nd (Mon); and * come back online on Nov 12th (Mon). Peff, could you be the interim maintainer as

Re: build deps

2012-10-16 Thread Michael J Gruber
David Aguilar venit, vidit, dixit 16.10.2012 03:39: On Mon, Oct 15, 2012 at 1:53 PM, Junio C Hamano gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: grep.c:451:16: warning: comparison of unsigned enum expression 0 is always false [-Wtautological-compare

[PATCH 1/4] t3419-rebase-patch-id: heed USR_BIN_TIME prereq

2012-10-16 Thread Michael J Gruber
t3419 sets the t3419-rebase-patch-id.sh prereq based on the availability of /usr/bin/time but calls the binary unconditionally (in debug mode). Make it run the timing only when the prereq is matched. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t3419-rebase-patch-id.sh | 4

[PATCH 2/4] test-lib: allow variable export from lazy prereq tests

2012-10-16 Thread Michael J Gruber
Currently, lazy prereq tests are run in a subshell which communicates only the exit code to the outer world. Run it as a subcommand so that variables can be exported to the test environment. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I don't think this has any adverse side

[RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Some test want to use the time command (not the shell builtin) and test for its availability at /usr/bin/time. Provide a lazy prereq TIME_COMMAND which tests for /usr/bin/time and /bin/time. If any is found, set TEST_COMMAND_PATH to the first match. Signed-off-by: Michael J Gruber g

[PATCH 4/4] t3302,t3419: use the TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Use the TIME_COMMAND prereq in both tests so that time from several paths can be used. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/t3302-notes-index-expensive.sh | 5 ++--- t/t3419-rebase-patch-id.sh | 7 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff

[RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Some test want to use the time command (not the shell builtin) and test for its availability at /usr/bin/time. Provide a lazy prereq TIME_COMMAND which tests for $TEST_COMMAND_PATH, which can be set from config.mak. It defaults to /usr/bin/time. Signed-off-by: Michael J Gruber g

Re: [PATCH] notes: mention --notes in more places

2012-10-18 Thread Michael J Gruber
Jeff King venit, vidit, dixit 17.10.2012 21:05: On Wed, Oct 17, 2012 at 07:30:56AM -0600, Eric Blake wrote: We've talked about it several times, but it's never happened (probably because most people don't actually use notes). And people (like me) don't use notes because they aren't

Re: [PATCH 0/6] Bring format-patch --notes closer to a real feature

2012-10-18 Thread Michael J Gruber
Nguyen Thai Ngoc Duy venit, vidit, dixit 18.10.2012 13:06: On Thu, Oct 18, 2012 at 12:45 PM, Junio C Hamano gits...@pobox.com wrote: This replaces the earlier wip with a real thing. We never advertised the --notes option to format-patch (or anything related to the pretty format options for

Re: [PATCH] Add new git-remote-hd helper

2012-10-18 Thread Michael J Gruber
Felipe Contreras venit, vidit, dixit 17.10.2012 14:58: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I've looked at many hg-git tools and none satisfy me. Too complicated, or too slow, or to difficult to setup, etc. It's in an unsatisfying state, I agree. We have a great

Re: signing commits with openssl/PKCS#11

2012-10-24 Thread Michael J Gruber
Mat Arge venit, vidit, dixit 22.10.2012 15:38: Hy! I would like to sign each commit with a X.509 certificate and a private key stored on a PKCS#11 token. I assume that that should be possible somehow using a hook which calls openssl. Does somebody know a working implementation of this?

Re: Is git mktag supposed to accept git cat-file input?

2012-10-25 Thread Michael J Gruber
Anand Kumria venit, vidit, dixit 25.10.2012 02:58: Ahh, unix time. Of course. That's the only difference *at the time being*, but this is not guaranteed. Really, as Brandon says: cat-file -p is pretty printing for human readability (which could be improved), and cat-file type is the raw format

[PATCH] replace: parse revision argument for -d

2012-10-26 Thread Michael J Gruber
the replacement, take the argument literally if it can not be resolved to a full sha1. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/replace.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index e3aaf70

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
Jeff King venit, vidit, dixit 29.10.2012 07:58: On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote: for (p = argv; *p; p++) { -if (snprintf(ref, sizeof(ref), refs/replace/%s, *p) +q = *p; +if (get_sha1(q, sha1

  1   2   3   4   5   6   7   8   9   >