git, branch v1.2.5

Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.

2006-04-04T06:42:25Z

Might as well ape the sigaction change in read-tree.c to avoid the same potential problems. The fprintf status output will be overwritten in a second, so don't bother guarding it. Do move the fputc after disabling SIGALRM to ensure we go to the next line, though. Also add a NO_SA_RESTART option in the Makefile in case someone doesn't have SA_RESTART but does restart (maybe older HP/UX?). We want the builder to chose this specifically in case the system both lacks SA_RESTART and does not restart stdio calls; a compat #define in git-compat-utils.h would silently allow broken systems. Signed-off-by: Jason Riedy Signed-off-by: Junio C Hamano

safe_fgets() - even more anal fgets()

2006-04-04T06:42:25Z

This is from Linus -- the previous round forgot to clear error after EINTR case. Signed-off-by: Junio C Hamano

pack-objects: be incredibly anal about stdio semantics

2006-04-02T20:46:27Z

This is the "letter of the law" version of using fgets() properly in the face of incredibly broken stdio implementations. We can work around the Solaris breakage with SA_RESTART, but in case anybody else is ever that stupid, here's the "safe" (read: "insanely anal") way to use fgets. It probably goes without saying that I'm not terribly impressed by Solaris libc. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Fix Solaris stdio signal handling stupidities

2006-04-02T20:41:56Z

This uses sigaction() to install the SIGALRM handler with SA_RESTART, so that Solaris stdio doesn't break completely when a signal interrupts a read. Thanks to Jason Riedy for confirming the silly Solaris signal behaviour. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

tar-tree: file/dirmode fix.

2006-03-04T05:36:38Z

This fixes two bugs introduced when we switched to generic tree traversal code. (1) directory mode recorded silently became 0755, not 0777 (2) if passed a tree object (not a commit), it emitted an alarming error message (but proceeded anyway). Signed-off-by: Junio C Hamano

read-tree --aggressive: remove deleted entry from the working tree.

2006-03-02T07:20:01Z

When both heads deleted, or our side deleted while the other side did not touch, we did not have to update the working tree. However, we forgot to remove existing working tree file when we did not touch and the other side did. Signed-off-by: Junio C Hamano

Merge branch 'lt/fix-apply' into maint

2006-03-02T01:06:12Z

* lt/fix-apply: git-am: --whitespace=x option. git-apply: war on whitespace -- finishing touches. git-apply --whitespace=nowarn apply --whitespace: configuration option. apply: squelch excessive errors and --whitespace=error-all apply --whitespace fixes and enhancements. The war on trailing whitespace

git-mv: fixes for path handling

2006-03-01T20:13:46Z

Moving a directory ending in a slash was not working as the destination was not calculated correctly. E.g. in the git repo, git-mv t/ Documentation gave the error Error: destination 'Documentation' already exists To get rid of this problem, strip trailing slashes from all arguments. The comment in cg-mv made me curious about this issue; Pasky, thanks! As result, the workaround in cg-mv is not needed any more. Also, another bug was shown by cg-mv. When moving files outside of a subdirectory, it typically calls git-mv with something like git-mv Documentation/git.txt Documentation/../git-mv.txt which triggers the following error from git-update-index: Ignoring path Documentation/../git-mv.txt The result is a moved file, removed from git revisioning, but not added again. To fix this, the paths have to be normalized not have ".." in the middle. This was already done in git-mv, but only for a better visual appearance :( Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano

git-mv: Allow -h without repo & fix error message

2006-03-01T20:13:44Z

This fixes "git-mv -h" to output the usage without the need to be in a git repository. Additionally: - fix confusing error message when only one arg was given - fix typo in error message Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano

Allow git-mv to accept ./ in paths.

2006-03-01T20:12:53Z

Signed-off-by: Junio C Hamano (cherry picked from 9a0e6731c632c841cd2de9dec0b9091b2f10c6fd commit)