git, branch v1.5.6.1

GIT 1.5.6.1

2008-06-26T00:13:48Z

Signed-off-by: Junio C Hamano

fix update-hook-example to work with packed tag references

2008-06-25T19:44:32Z

The update-hook-example used 'test -f' to check the tag present, which does not work if the checked reference is packed. This check has been changed to use 'git rev-parse $tag' instead. Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

clone: create intermediate directories of destination repo

2008-06-25T18:44:15Z

The shell version used to use "mkdir -p" to create the repo path, but the C version just calls "mkdir". Let's replicate the old behavior. We have to create the git and worktree leading dirs separately; while most of the time, the worktree dir contains the git dir (as .git), the user can override this using GIT_WORK_TREE. We can reuse safe_create_leading_directories, but we need to make a copy of our const buffer to do so. Since merge-recursive uses the same pattern, we can factor this out into a global function. This has two other cleanup advantages for merge-recursive: 1. mkdir_p wasn't a very good name. "mkdir -p foo/bar" actually creates bar, but this function just creates the leading directories. 2. mkdir_p took a mode argument, but it was completely ignored. Acked-by: Daniel Barkalow Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-combine-diff-pre-context' into maint

2008-06-25T18:20:01Z

* jc/maint-combine-diff-pre-context: diff -c/--cc: do not include uninteresting deletion before leading context

Merge branch 'lt/maint-gitdir-relative' into maint

2008-06-25T18:19:33Z

* lt/maint-gitdir-relative: Make git_dir a path relative to work_tree in setup_work_tree()

Merge branch 'sb/maint-rebase' into maint

2008-06-25T18:18:39Z

* sb/maint-rebase: git-rebase.sh: Add check if rebase is in progress

for-each-ref: implement missing tag values

2008-06-25T18:05:26Z

The "type" and "object" fields for tags were accepted as valid atoms, but never implemented. Consequently, they simply returned the empty string, even for valid tags. Noticed by Lea Wiemann. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git-svn: make rebuild respect rewriteRoot option

2008-06-24T00:38:08Z

Suppose someone fetches git-svn-ified commits from another repo and then attempts to use 'git-svn init --rewrite-root=foo bar'. Using git svn rebase after that will fail badly: * For each commit tried by working_head_info, rebuild is called indirectly. * rebuild will iterate over all commits and skip all of them because the URL does not match. Because of that no rev_map file is generated at all. * Thus, rebuild will run once for every commit. This takes ages. * In the end there still isn't any rev_map file and thus working_head_info fails. Addressing this behaviour fixes an apparently not too uncommon problem with providing git-svn mirrors of Subversion repositories. Some repositories are accessed using different URLs depending on whether the user has push privileges or not. In the latter case, an anonymous URL is often used that differs from the push URL. Providing a mirror that is usable in both cases becomes a lot more possible with this change. Signed-off-by: Jan Krüger Acked-by: Eric Wong Signed-off-by: Junio C Hamano

Workaround for AIX mkstemp()

2008-06-23T23:13:38Z

The AIX mkstemp will modify it's template parameter to an empty string if the call fails. This caused a subsequent mkdir to fail. Signed-off-by: Patrick Higgins Signed-off-by: Junio C Hamano

Extend parse-options test suite

2008-06-23T01:15:18Z

This patch serves two purposes: 1. test-parse-option.c should be a more complete example for the parse-options API, and 2. there have been no tests for OPT_CALLBACK, OPT_DATE, OPT_BIT, OPT_SET_INT and OPT_SET_PTR before. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano