[BUG?] `config branch.autosetuprebase true` breaks `rev-parse --is-inside-work-tree`

Dear all, I am not sure if this is an actual bug or just a corner case that's not worth to be fixed. This was not tested with HEAD or even 2.1.2, but 2.1.1. Notwithstanding if the setting is correct, shouldn't rev-parse be resilient enough to at least be able to tell if we're in a work tree? I u

Git won Linux Magazine's Linux New Media Award in the category "Outstanding Contribution to Open Source/Linux/Free Software"

Dear all, Git won an award in the main category of the English & German Linux Magazine at CeBIT, this year. Jens Lehmann, Heiko Voigt, and myself were present to accept the award on behalf of the Git community as a whole. You can find a short blurb on my blog[1], including a picture of the phys

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

On Sun, Jul 14, 2013 at 9:20 PM, Junio C Hamano wrote: > Shells on modern distros and platforms have "echo" built-in, so this > patch replaces series of writes internal to the shell with a fork to > cat with heredoc (which often is implemented with a temporary file). True; fwiw, I replaced my on

[PATCH 3/6] templates: Fix spelling in pre-commit hook

Based on 0b9b01276553de8097442c3c996b7a49367dd234 in original patch series. Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre

[PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. Convert all of those tabs to whitespace, instead. Verbatim copy of 11edd8a05778700382e6a21cfc0a6b5b72eff852 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann --- templates/hooks--pre

[PATCH 4/6] Documentation: Update manpage for pre-commit hook

Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann --- Documentation/githooks.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt

[PATCH 6/6] template: Fix comment indentation in pre-rebase hook

The other hooks use two whitespace for indentation instead of tabs to signify code in the example/echo output. Follow the same layout in templates/hooks--pre-rebase.sample Based on d153a68bebfabc1db5241d02ee75fa5cb4538ab0 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann

[PATCH 1/6] templates: Use heredoc in pre-commit hook

Spawning a new subprocess for every line printed is inefficient. Use heredoc, instead. Based on 98770971aef8d1cbc78876d9023d10aa25df0526 in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample | 25 + 1 file

[PATCH 2/6] templates: Reformat pre-commit hook's message

Now that we're using heredoc, the message can span the full 80 chars. Verbatim copy of 634709b489bb3db79f59127fd6bf79c5fd9b5ddf in original patch series from 2013-06-10. Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample |6 ++ 1 file changed, 2 insertions(

[PATCH 0/6] Update to janitorial work on hook templates

Dear all, I worked Jeff's and Junio's feedback into this patch series, referencing the old commits. As stated earlier, you are welcome to drop 1/6, but 2/6 depends on it. Your choice, both is fine by me. Thanks, Richard Richard Hartmann (6): templates: Use heredoc in pre-c

Re: [PATCH 6/6] template: Fix comment indentation in pre-rebase hook

On Tue, Jun 11, 2013 at 12:57 AM, Junio C Hamano wrote: > [PATCH 1/6] templates: Fewer subprocesses in pre-commit hook > > I agree with Peff that "less fork" is a bad justification for this > change, and also > > echo 'First line > second line > third lie' > >

Re: [PATCH 6/6] template: Fix comment indentation in pre-rebase hook

On Mon, Jun 10, 2013 at 9:52 PM, Junio C Hamano wrote: > I think offsetting the actual commands to the right is correct, but > "if these match" and "if this is empty" should be flushed to left as > this patch shows. I actually considered this and decided against it as it seemed to be deliberate

Re: [PATCH 1/6] templates: Fewer subprocesses in pre-commit hook

Hi Junio, if you want a new patch, just say the word. Richard -- 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

[PATCH 0/4] Janitorial work on hook templates

Dear all, attached, you will find a series of small, obvious, and hopefully uncontroversial patches for the hook templates and the manpage. They are all tiny, but I still decided to submit distinct patches to make modification/discussion easier. Richard Hartmann (6): templates: Fewer

[PATCH 5/6] templates: Fix ASCII art in pre-rebase hook

The example assumes 8-char wide tabs and breaks for people with 4-char wide tabs. Signed-off-by: Richard Hartmann --- templates/hooks--pre-rebase.sample | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks

[PATCH 3/6] templates: Fix spelling in pre-commit hook

Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 7676c6e..a982d99 100755 --- a/templates/hooks--pre-commit.sample

[PATCH 1/6] templates: Fewer subprocesses in pre-commit hook

Spawning a new subprocess for every line printed is inefficient. Thus spawn only one instance of `echo`. Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/hooks--pre

[PATCH 2/6] templates: Reformat pre-commit hook's message

Now that the there's only one echo being spawned, the message can span the full 80 chars. Signed-off-by: Richard Hartmann --- templates/hooks--pre-commit.sample |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/

[PATCH 6/6] template: Fix comment indentation in pre-rebase hook

The other hooks use two whitespace for indentation instead of tabs to signify code in the example/echo output. Follow the same layout in templates/hooks--pre-rebase.sample Signed-off-by: Richard Hartmann --- templates/hooks--pre-rebase.sample | 10 +- 1 file changed, 5 insertions

[PATCH 4/6] Documentation: Update manpage for pre-commit hook

Signed-off-by: Richard Hartmann --- Documentation/githooks.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index b9003fe..1276730 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -80,7

Re: [PATCH] Solve git-submodule issues with detached work trees

PPS: Yes, I know that I am replying in a patch thread. I will try it asap. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Solve git-submodule issues with detached work trees

On Mon, Jul 23, 2012 at 7:09 AM, Junio C Hamano wrote: > I think this is in line with what we discussed earlier on list when > the interaction between GIT_DIR/GIT_WORK_TREE and submodules came up > the last time. Jens? Yes, it is. I still have your email marked as TODO to get back to you as I