diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-11-28 01:30:16 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-11-28 01:30:16 +0000 |
| commit | f8e5d57fe36843ab92607a3a473c4d52c52b9f07 (patch) | |
| tree | 6d99cabc2ba7cfd16f32790de0be48fa833d7c97 /scripts | |
| parent | 53819365cf8b1dad870cf97a1f33bd7579f6b6ed (diff) | |
| download | quilt-f8e5d57fe36843ab92607a3a473c4d52c52b9f07.tar.gz | |
- Oops, the /dev/null "fix" broke create-delete.test. Back out this change
and fix only the specific -p0 case.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/patchfns.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 714c7a6..b74cce5 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -539,6 +539,7 @@ diff_file() if ! [ -s "$old_file" ] then old_file=/dev/null + old_hdr=/dev/null [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \ || old_date=$'\t'"1970-01-01 00:00:00.000000000 +0000" else @@ -548,7 +549,10 @@ diff_file() fi if ! [ -s "$new_file" ] then + [ $opt_strip_level -eq 0 ] \ + && old_hdr=$new_hdr new_file=/dev/null + new_hdr=/dev/null [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \ || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000" else |