git, branch v1.5.4-rc5

GIT 1.5.4-rc5

2008-01-27T06:48:03Z

Hopefully the last rc before the final... Signed-off-by: Junio C Hamano

pull --rebase: be cleverer with rebased upstream branches

2008-01-27T02:24:24Z

When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

cvsserver: Fix for histories with multiple roots

2008-01-27T01:58:18Z

Git histories may have multiple roots, which can cause git merge-base to fail and this caused git cvsserver to die. This commit teaches git cvsserver to handle a failing git merge-base gracefully, and modifies the test case to verify this. All the test cases now use a history with two roots. Signed-off-by: Steffen Prohaska git-cvsserver.perl | 9 ++++++++- t/t9400-git-cvsserver-server.sh | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano

t9400-git-cvsserver-server: Wrap setup into test case

2008-01-27T01:44:05Z

It is preferable to have the test setup in a test case. The setup itself may fail and having it as a test case handles this situation more gracefully. Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano

Documentation: add a bit about sendemail.to configuration

2008-01-26T18:59:07Z

While there is information about this in the configuration section, it was missing in the options section. Signed-off-by: Mike Hommey Signed-off-by: Junio C Hamano

parse-options: catch likely typo in presense of aggregated options.

2008-01-26T18:53:31Z

If options are aggregated, and that the whole token is an exact prefix of a long option that is longer than 2 letters, reject it. This is to prevent a common typo: $ git commit -amend to get interpreted as "commit all with message 'end'". The typo check isn't performed if there is no aggregation, because the stuck form is the recommended one. If we have `-o` being a valid short option that takes an argument, and --option a long one, then we _MUST_ accept -option as "'o' option with argument 'ption'", which is our official recommended form. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Add a missing dependency on http.h

2008-01-26T18:52:40Z

Signed-off-by: Mike Hommey Signed-off-by: Junio C Hamano

git pull manpage: don't include -n from fetch-options.txt

2008-01-26T06:42:36Z

The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

git-svn(1): update instructions for resuming a git-svn clone

2008-01-26T06:31:52Z

git-svn expects its references under refs/remotes/*; but these will not be copied or set by "git clone"; put in this man page the manual fiddling that is required with current git-svn to get this to work. Signed-off-by: Sam Vilain Signed-off-by: Junio C Hamano

autoconf: define NO_SYS_SELECT_H on systems without .

2008-01-26T06:26:08Z

Pre-POSIX.1-2001 systems don't have , but select(2) is declared in , which git-compat-util.h includes. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano