git, branch v1.5.6-rc1

GIT v1.5.6-rc1

2008-06-03T07:17:22Z

Signed-off-by: Junio C Hamano

commit: drop duplicated parents

2008-06-03T06:55:57Z

The scripted version of git-commit internally used git-commit-tree which omitted duplicated parents given from the command line. This prevented a nonsensical octopus merge from getting created even when you said "git merge A B" while you are already on branch A. However, when git-commit was rewritten in C, this sanity check was lost. This resurrects it. Signed-off-by: Junio C Hamano

rebase --interactive: Compute upstream SHA1 before switching branches

2008-06-03T03:36:14Z

If the upstream argument to rebase (the first argument) was relative to HEAD and the name of the branch to rebase (the second argument) was given, the upstream would have been interpreted relative to the second argument. In particular, this command git rebase -i HEAD topic would always finish with "Nothing to do". (a1bf91e fixed the same issue for non-interactive rebase.) Signed-off-by: Johannes Sixt Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Documentation/git-filter-branch.txt: Fix description of --commit-filter

2008-06-03T03:36:09Z

The old description was misleading and logically impossible. It claimed that the ancestors of the original commit would be re-written to have the multiple emitted ids as parents. Not only would this modify existing objects, but it would create a cycle. What this actually does is pass the multiple emitted ids to the newly-created children to use as parents. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano

gitweb: Fix "next" link on bottom of page

2008-06-03T03:36:02Z

Fix search form generation to not modify $cgi->param(...)'s. In git_header_html() we used to use $cgi->hidden(-name => "a") etc. to generate hidden fields; unfortunately to use this form it is required to modify $cgi->param("a") etc., which makes href(-replay,...) use wrong replay values. This for example made the "next" link on the bottom of the page has a=search instead of a=$action, and thus fails to get you to the next page. Because in CGI the value of a hidden field is "sticky", there is no way to modify it short of modifying $cgi->param(...). Therefore it got replaced by generating element [semi] directly. Alternate solution would be for href(-replay,...) to use values saved in global variables, such as $action etc., instead of (re)reading them from $cgi->param($symbol). The bad link was reported by Kai Blin through http://bugs.debian.org/481902 Reported-by: Kai Blin Signed-off-by: Jakub Narebski Tested-by: Gerrit Pape Signed-off-by: Junio C Hamano

Revert "git.el: Set process-environment instead of invoking env"

2008-06-03T02:07:12Z

This reverts commit dbe48256b41c1e94d81f2458d7e84b1fdcb47026, which caused mis-encoding of non-ASCII author/committer names when the git-status mode is used to create commits. Signed-off-by: Karl Hasselström Signed-off-by: Junio C Hamano

Merge branch 'sb/am-tests'

2008-06-02T06:45:41Z

* sb/am-tests: Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh Add test cases for git-am

Merge branch 'lw/test-fix'

2008-06-02T06:45:37Z

* lw/test-fix: t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons

Merge branch 'sp/remote'

2008-06-02T06:43:30Z

* sp/remote: Make "git-remote rm" delete refs acccording to fetch specs Make "git-remote prune" delete refs according to fetch specs Remove unused remote_prefix member in builtin-remote

Merge branch 'lt/pack-sync'

2008-06-02T06:43:21Z

* lt/pack-sync: Remove now unnecessary 'sync()' calls Make pack creation always fsync() the result