git, branch v1.2.4

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)

combine-diff: Honour -z option correctly.

2006-03-01T12:09:41Z

Combined diffs don't null terminate things in the same way as standard diffs. This is presumably wrong. Signed-off-by: Mark Wooding Signed-off-by: Junio C Hamano (cherry picked from 6baf0484efcd29bb5e58ccd5ea0379481d4a83f4 commit)

combine-diff: Honour --full-index.

2006-03-01T12:09:40Z

For some reason, combined diffs don't honour the --full-index flag when emitting patches. Fix this. Signed-off-by: Mark Wooding Signed-off-by: Junio C Hamano (cherry picked from e70c6b35749c316f6e97099bd6bdac895c9d6f68 commit)

diffcore-break: micro-optimize by avoiding delta between identical files.

2006-03-01T12:08:12Z

We did not check if we have the same file on both sides when computing break score. This is usually not a problem, but if the user said --find-copies-harde with -B, we ended up trying a delta between the same data even when we know the SHA1 hash of both sides match. Signed-off-by: Junio C Hamano (cherry picked from aeecd23ae2785a0462d42191974e9d9a8e439fbe commit)

git-am: --whitespace=x option.

2006-03-01T06:38:40Z

This is passed down to git-apply to override the built-in default and per-repository configuration at runtime. Signed-off-by: Junio C Hamano

git-apply: war on whitespace -- finishing touches.

2006-02-28T09:17:14Z

This changes the default --whitespace policy to nowarn when we are only getting --stat, --summary etc. IOW when not applying the patch. When applying the patch, the default is warn (spit out warning message but apply the patch). Signed-off-by: Junio C Hamano

git-apply --whitespace=nowarn

2006-02-28T01:36:00Z

Andrew insists --whitespace=warn should be the default, and I tend to agree. This introduces --whitespace=warn, so if your project policy is more lenient, you can squelch them by having apply.whitespace=nowarn in your configuration file. Signed-off-by: Junio C Hamano