diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-09-22 16:17:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-21 21:27:51 -0800 |
| commit | 1a9eb3b9d50367bee8fe85022684d812816fe531 (patch) | |
| tree | 32f72067319d73d0eaa19d91dd6e9308c4f68288 /gitweb/gitweb.perl | |
| parent | Doc: Make comment about merging in tutorial.txt more clear (diff) | |
| download | tgif-1a9eb3b9d50367bee8fe85022684d812816fe531.tar.xz | |
git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)
Somebody was wondering on #git channel why a git generated diff
does not apply with GNU patch when the filename contains a SP.
It is because GNU patch expects to find TAB (and trailing timestamp)
on ---/+++ (old_name and new_name) lines after the filenames.
The "diff --git" output format was carefully designed to be
compatible with GNU patch where it can, but whitespace
characters were always a pain.
This adds an extra TAB (but not trailing timestamp) to old_name
and new_name lines of git-diff output when the filename has a SP
in it. An earlier patch updated git-apply to prepare for this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb/gitweb.perl')
0 files changed, 0 insertions, 0 deletions