git, branch v0.99.9l

GIT 0.99.9l aka 1.0rc4

2005-12-04T07:46:02Z

[PATCH] daemon.c and path.enter_repo(): revamp path validation.

2005-12-04T07:17:42Z

The whitelist of git-daemon is checked against return value from enter_repo(), and enter_repo() used to return the value obtained from getcwd() to avoid directory aliasing issues as discussed earier (mid October 2005). Unfortunately, it did not go well as we hoped. For example, /pub on a kernel.org public machine is a symlink to its real mountpoint, and it is understandable that the administrator does not want to adjust the whitelist every time /pub needs to point at a different partition for storage allcation or whatever reasons. Being able to keep using /pub/scm as the whitelist is a desirable property. So this version of enter_repo() reports what it used to chdir() and validate, but does not use getcwd() to canonicalize the directory name. When it sees a user relative path ~user/path, it internally resolves it to try chdir() there, but it still reports ~user/path (possibly after appending .git if allowed to do so, in which case it would report ~user/path.git). What this means is that if a whitelist wants to allow a user relative path, it needs to say "~" (for all users) or list user home directories like "~alice" "~bob". And no, you cannot say /home if the advertised way to access user home directories are ~alice,~bob, etc. The whole point of this is to avoid unnecessary aliasing issues. Anyway, because of this, daemon needs to do a bit more work to guard itself. Namely, it needs to make sure that the accessor does not try to exploit its leading path match rule by inserting /../ in the middle or hanging /.. at the end. I resurrected the belts and suspender paranoia code HPA did for this purpose. This check cannot be done in the enter_repo() unconditionally, because there are valid callers of enter_repo() that want to honor /../; authorized users coming over ssh to run send-pack and fetch-pack should be allowed to do so. Signed-off-by: Junio C Hamano

A few more options for git-cat-file

2005-12-04T07:07:17Z

This adds '-e' option to git-cat-file, to test for the existence of the object. This also cleans up the option-parsing in git-cat-file slightly. [jc: HPA version had -n option which did rev-parse --verify; the real value of this patch is the option parsing cleanup.] Signed-off-by: H. Peter Anvin Signed-off-by: Junio C Hamano

Add compat/setenv.c, use in git.c.

2005-12-04T06:25:25Z

There is no setenv() in Solaris 5.8. The trivial calls to setenv() were replaced by putenv() in a much earlier patch, but setenv() was used again in git.c. This patch just adds a compat/setenv.c. The rule for building git$(X) also needs to include compat. objects and compiler flags. Those are now in makefile vars COMPAT_OBJS and COMPAT_CFLAGS. Signed-off-by: E. Jason Riedy Signed-off-by: Junio C Hamano

New test case: Criss-cross merge

2005-12-03T20:29:07Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

New test case: merge with directory/file conflicts

2005-12-03T20:29:05Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

test-lib.sh: Add new function, test_expect_code

2005-12-03T20:28:57Z

The test is considered OK if it exits with code $1 Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

git-merge: Exit with code 2 if no strategy was able to handle the merge.

2005-12-03T20:28:52Z

This way it is possible to test in scripts if the merge was non-clean or if the strategy had other problems with the merge. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

documentation: git-tag

2005-12-02T20:20:34Z

[jc: light edit applied on top of the original] Signed-off-by: Junio C Hamano

documentation: git-bisect (help HTML break man)

2005-12-02T20:20:34Z

Use the same trick Josef used to introduce line breaks for git-mv documentation for now, to help HTML rendering. This breaks manpages and we need to come up with a better solution. Noticed by linux@horizon.com (No Name). Signed-off-by: Junio C Hamano