delta/git.git, branch v1.0.4

GIT 1.0.4

2005-12-24T08:02:08+00:00

Signed-off-by: Junio C Hamano

mailinfo: iconv does not like "latin-1" -- should spell it "latin1"

2005-12-24T07:56:52+00:00

This was a stupid typo that did not follow

	http://www.iana.org/assignments/character-sets

Long noticed but neglected by JC, but finally reported by
Marco.

Signed-off-by: Junio C Hamano

ls-files --full-name: usage string and documentation.

2005-12-23T23:51:33+00:00

Somehow this option was not mentioned anywhere in the
documentation nor the usage string.

Signed-off-by: Junio C Hamano

merge --no-commit: tweak message

2005-12-23T23:48:09+00:00

We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed.  Tell
these cases apart and phrase dying message differently.

Signed-off-by: Junio C Hamano

show-branch: usability updates.

2005-12-23T22:16:19+00:00

This does three things:

 . It simplifies the logic to handle the case in which no
   refs are given on the command line, and fixes the bug
   when only "--heads" is specified.  Earlier we showed
   them twice.

 . It avoids to add the same ref twice.

 . It sorts the glob result (e.g. "git show-branch
   'tags/v1.0*'") according to a more version friendly
   sort order.

Signed-off-by: Junio C Hamano

check_packed_git_idx(): check integrity of the idx file itself.

2005-12-23T22:14:28+00:00

Although pack-check.c had routine to verify the checksum for the
pack index file itself, the core did not check it before using
it.

This is stolen from the patch to tighten packname requirements.

Signed-off-by: Junio C Hamano 
(cherry picked from 797bd6f490c91c07986382b9f268e0df712cb246 commit)

GIT 1.0.3

2005-12-23T02:14:31+00:00

Signed-off-by: Junio C Hamano

sha1_to_hex: properly terminate the SHA1

2005-12-22T20:52:37+00:00

sha1_to_hex() returns a pointer to a static buffer. Some of its users
modify that buffer by appending a newline character. Other users rely
on the fact that you can call

	printf("%s", sha1_to_hex(sha1));

Just to be on the safe side, terminate the SHA1 in sha1_to_hex().

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

Fix for http-fetch from file:// URLs

2005-12-22T20:52:35+00:00

Recognize missing files when using http-fetch with file:// URLs

Signed-off-by: Nick Hengeveld 
Signed-off-by: Junio C Hamano

git-format-patch should show the correct version

2005-12-22T20:52:29+00:00

We want to record the version of the tools the patch was generated with.
While these tools could be rebuilt, git-format-patch stayed the same and
report the wrong version.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano