user/sven/git.git/templates, branch v2.6.1

Merge branch 'nd/multiple-work-trees'

2015-05-11T21:23:39Z

A replacement for contrib/workdir/git-new-workdir that does not rely on symbolic links and make sharing of objects and refs safer by making the borrowee and borrowers aware of each other. * nd/multiple-work-trees: (41 commits) prune --worktrees: fix expire vs worktree existence condition t1501: fix test with split index t2026: fix broken &&-chain t2026 needs procondition SANITY git-checkout.txt: a note about multiple checkout support for submodules checkout: add --ignore-other-wortrees checkout: pass whole struct to parse_branchname_arg instead of individual flags git-common-dir: make "modules/" per-working-directory directory checkout: do not fail if target is an empty directory t2025: add a test to make sure grafts is working from a linked checkout checkout: don't require a work tree when checking out into a new one git_path(): keep "info/sparse-checkout" per work-tree count-objects: report unused files in $GIT_DIR/worktrees/... gc: support prune --worktrees gc: factor out gc.pruneexpire parsing code gc: style change -- no SP before closing parenthesis checkout: clean up half-prepared directories in --to mode checkout: reject if the branch is already checked out elsewhere prune: strategies for linked checkouts checkout: support checking out into a new working directory ...

pre-push.sample: remove unnecessary and misleading IFS=' '

2014-12-22T18:27:42Z

The sample hook explicitly sets IFS to SP and nothing else so that the "read" used in the per-ref while loop that iterates over " SP SP SP " records, where we know refs and sha1s will not have SPs, would split them correctly. While this is not wrong per-se, it is not necessary; because we know these fields do not contain HT or LF, either, we can simply leave IFS the default. This will also prevent those who cut and paste from this sample from getting bitten when they write things in the per-ref loop that need splitting with the default $IFS (e.g. use $(git rev-list ...) to produce one-record-per-line output). Signed-off-by: Jim Hill Signed-off-by: Junio C Hamano

*.sh: avoid hardcoding $GIT_DIR/hooks/...

2014-12-01T19:00:13Z

If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not $GIT_DIR/hooks/. Just let rev-parse --git-path handle it. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

pre-push.sample: Write error message to stderr

2014-09-11T22:26:35Z

githooks(5) suggests: Information about why the push is rejected may be sent to the user by writing to standard error. So follow that advice in the sample. Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano

sample pre-commit hook: use --bool when retrieving config var

2013-09-24T19:26:49Z

Currently if you set [hooks] allowNonAscii (or allownonascii = 1, or = yes) in your .git/config then the sample pre-commit misinterprets the value as "false" and rejects non-ASCII filenames. Use "git config --bool" to get the usual nicer boolean handling. Signed-off-by: Johan Herland Signed-off-by: Jonathan Nieder

Merge branch 'maint-1.8.3' into maint

2013-09-03T20:54:32Z

* maint-1.8.3: fix shell syntax error in template

fix shell syntax error in template

2013-08-30T16:56:30Z

An if clause must not be empty; add a "colon" command. Signed-off-by: Thorsten Glaser Signed-off-by: Junio C Hamano

templates: spell ASCII in uppercase in pre-commit hook

2013-07-15T16:52:57Z

The name of the encoding is ASCII, not ascii. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano

templates: Reformat pre-commit hook's message

2013-07-15T16:52:52Z

Now that we're using heredoc, the message can span the full 80 chars. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano

templates: Use heredoc in pre-commit hook

2013-07-15T16:51:16Z

This way, it is easier to see how the text we give the end users would look like, and it will allow us to use (near) full width of the source file. Signed-off-by: Richard Hartmann Signed-off-by: Junio C Hamano