git/templates, branch v1.6.4

Merge branch 'hv/sample-update'

2009-05-23T08:39:15Z

* hv/sample-update: Extend sample update hook, disable modifying of existing tags

Extend sample pre-commit hook to check for non ascii filenames

2009-05-20T07:04:37Z

At the moment non-ascii encodings of filenames are not portably converted between different filesystems by git. This will most likely change in the future but to allow repositories to be portable among different file/operating systems this check is enabled by default. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

pre-commit.sample: don't print incidental SHA1

2009-05-16T18:57:17Z

Make the sample pre-commit hook script discard all git-rev-parse output, not just stderr. Otherwise, it would print an SHA1. Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Extend sample update hook, disable modifying of existing tags

2009-05-09T07:31:00Z

Because no special rule for this existed it was allowed by default Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

hook/update: example of how to prevent branch creation

2009-04-18T04:26:11Z

Since git doesn't provide a receive.denyBranchCreation or similar, here is an example of how to be sure users cannot create branches remotely by pushing a new reference. This setup has been proven useful to prevent creation of spurious branches because of users having their remote.origin.push set to HEAD, when they use `git push` while being on a local topic branch of theirs instead of the proper one. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Modify description file to say what this file is

2009-03-04T08:56:52Z

A lot of people see this message for the first time on the gitweb interface, where there is no clue as to what 'this file' means. Signed-off-by: John Tapsell Signed-off-by: Junio C Hamano

Fix permission bits on sources checked out with an overtight umask

2008-09-09T20:32:32Z

Two patches 9907721 (templates/Makefile: don't depend on local umask setting, 2008-02-28) and 96cda0b (templates/Makefile: install is unnecessary, just use mkdir -p, 2008-08-21) tried to prevent an overtight umask the builder/installer might have from screwing over the installation procedure, but we forgot there was another source of trouble. If the person who checked out the source tree had an overtight umask, it will leak out to the built products, which is propagated to the installation destination. Signed-off-by: Junio C Hamano

Install templates with the user and group of the installing personality

2008-08-20T23:01:45Z

If 'make install' was run with sufficient privileges, then the installed templates, which are copied using 'tar', would receive the user and group of whoever built git. This instructs 'tar' to ignore the user and group that are recorded in the archive. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'j6t/mingw'

2008-07-03T04:57:52Z

* j6t/mingw: (38 commits) compat/pread.c: Add a forward declaration to fix a warning Windows: Fix ntohl() related warnings about printf formatting Windows: TMP and TEMP environment variables specify a temporary directory. Windows: Make 'git help -a' work. Windows: Work around an oddity when a pipe with no reader is written to. Windows: Make the pager work. When installing, be prepared that template_dir may be relative. Windows: Use a relative default template_dir and ETC_GITCONFIG Windows: Compute the fallback for exec_path from the program invocation. Turn builtin_exec_path into a function. Windows: Use a customized struct stat that also has the st_blocks member. Windows: Add a custom implementation for utime(). Windows: Add a new lstat and fstat implementation based on Win32 API. Windows: Implement a custom spawnve(). Windows: Implement wrappers for gethostbyname(), socket(), and connect(). Windows: Work around incompatible sort and find. Windows: Implement asynchronous functions as threads. Windows: Disambiguate DOS style paths from SSH URLs. Windows: A rudimentary poll() emulation. Windows: Implement start_command(). ...

Update sample pre-commit hook to use "diff --check"

2008-06-27T05:08:25Z

Now "diff --check" can detect not just whitespace errors but also notices leftover conflict marker lines, we can use it in the sample pre-commit hook script. These days the object layer knows about the empty tree object without actually having one in the repository, so we can run the test even for the initial commit. Signed-off-by: Junio C Hamano