user/sven/git.git/path.c, branch v1.7.3.5

Merge branch 'hv/submodule-find-ff-merge'

2010-08-22T06:27:59Z

* hv/submodule-find-ff-merge: Implement automatic fast-forward merge for submodules setup_revisions(): Allow walking history in a submodule Teach ref iteration module about submodules Conflicts: submodule.c

Sync with 1.7.0 series

2010-07-27T22:01:36Z

config --get --path: check for unset $HOME

2010-07-27T17:58:46Z

If $HOME is unset (as in some automated build situations), currently git config --path path.home "~" git config --path --get path.home segfaults. Error out with Failed to expand user dir in: '~/' instead. Reported-by: Julien Cristau Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Teach ref iteration module about submodules

2010-07-07T16:48:21Z

We will use this in a later patch to extend setup_revisions() to load revisions directly from a submodule. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

Merge branch 'mm/mkstemps-mode-for-packfiles' into maint

2010-03-08T08:36:00Z

* mm/mkstemps-mode-for-packfiles: Use git_mkstemp_mode instead of plain mkstemp to create object files git_mkstemps_mode: don't set errno to EINVAL on exit. Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. Move gitmkstemps to path.c Add a testcase for ACL with restrictive umask.

Merge branch 'nd/root-git'

2010-03-07T20:47:15Z

* nd/root-git: Add test for using Git at root of file system Support working directory located at root Move offset_1st_component() to path.c init-db, rev-parse --git-dir: do not append redundant slash make_absolute_path(): Do not append redundant slash Conflicts: setup.c sha1_file.c

Merge branch 'mm/mkstemps-mode-for-packfiles'

2010-03-07T20:47:14Z

git_mkstemps_mode: don't set errno to EINVAL on exit.

2010-02-22T23:24:46Z

When reaching the end of git_mkstemps_mode, at least one call to open() has been done, and errno has been set accordingly. Setting errno is therefore not necessary, and actually harmfull since callers can't distinguish e.g. permanent failure from ENOENT, which can just mean that we need to create the containing directory. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument.

2010-02-22T23:24:45Z

gitmkstemps emulates the behavior of mkstemps, which is usually used to create files in a shared directory like /tmp/, hence, it creates files with permission 0600. Add git_mkstemps_mode() that allows us to specify the desired mode, and make git_mkstemps() a wrapper that always uses 0600 to call it. Later we will use git_mkstemps_mode() when creating pack files. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Move gitmkstemps to path.c

2010-02-22T23:24:45Z

This function used to be only a compatibility function, but we're going to extend it and actually use it, so make it part of Git. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano