git, branch v1.5.5.1

GIT 1.5.5.1

2008-04-20T18:36:53Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-rebase-am' into maint

2008-04-20T06:01:51Z

* jc/maint-rebase-am: rebase: do not munge commit log message Conflicts: git-am.sh

gitweb: Fix 'history' view for deleted files with history

2008-04-19T05:10:38Z

When asked for history of a file which is not present in given branch ("HEAD", i.e. current branch, or given by transient $hash_hase ('hb') parameter), but is present deeper in the history (meaning that "git rev-list --full-history $hash_base -- $file_name" is not empty), and there is no $hash ('h') parameter set for a file, gitweb would spew multiple of "Use of uninitialized value" warnings, and some links would be missing. This commit fixes this bug. This bug occurs in the rare cases when "git log -- " is empty and "git log --full-history -- " is not, or to be more exact in the cases when full-history starts later than given branch. It can happen if you are using handcrafted gitwb URL, or if you follow generic 'history' link or bookmark for a file which got deleted. Gitweb tried to get file type ('tree', or 'blob', or even 'commit') from the commit we start searching from (where the file was not present), and not among found commits. This was the cause of "Use of uninitialized value" warnings. This commit also add tests for such situation to t9500 test. While we are it, return HTTP error if there is _no_ history; it means that file or directory was not found (for given branch). Also error out if type of item could not be found: it should not happen now, but better be sure. Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

Document that WebDAV doesn't need git on the server, and works over SSL

2008-04-19T05:09:24Z

I managed to set up a Git repository on a preconfigured WebDAV server, and using HTTPS, without installing Git on it or changing the server configuration. This works through a proxy too. This patch reflects this (it previously stated that Git was _necessary_ on the server, which isn't true). Also give a few hints to troubleshoting. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'maint-1.5.4' into maint

2008-04-19T05:07:00Z

* maint-1.5.4: am: POSIX portability fix

git-remote: reject adding remotes with invalid names

2008-04-18T23:31:27Z

This can happen if the arguments to git-remote add is switched by the user, and git would only show an error if fetching was also requested. Fix it by using the refspec parsing engine to check if the requested name can be parsed as a remote before add it. Also cleanup so that the "remote..url" config name buffer is only initialized once. Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano

am: POSIX portability fix

2008-04-18T23:11:40Z

POSIX allows echo without flag to interpret specials such as \n, and we tried to make things portable by using printf instead where it matters. Recently added code to "git am" had unprotected "echo", which was caught by t4014 and Rémi Vanicat. This should fix it. Signed-off-by: Junio C Hamano

Merge branch 'maint-1.5.4' into maint

2008-04-17T00:04:05Z

* maint-1.5.4: git-am: minor cleanup Clarify and fix English in "git-rm" documentation

git-am: minor cleanup

2008-04-16T23:46:26Z

This moves the assignment to FIRSTLINE down so that we do not have to have multiple copies. Suggested by Linus. Signed-off-by: Junio C Hamano

Clarify and fix English in "git-rm" documentation

2008-04-16T23:45:23Z

Do some verb-noun agreement changes. Clarify some file globbing cases. Fixed a wrong statement in an example. Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano