* [BUG] apply: test for trailing whitespace & no new line bug
@ 2009-06-22 11:49 y
0 siblings, 0 replies; 2+ messages in thread
From: y @ 2009-06-22 11:49 UTC (permalink / raw)
To: git; +Cc: SZEDER Gábor
From: SZEDER Gábor <szeder@ira.uka.de>
If a patch adds a new line to the end of a file and this line ends
with trailing whitespace but has no newline, then 'git apply
--whitespace=fix' does not remove the trailing whitespace from that
line.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
Noticed last week, but couldn't fix it myself during the weekend.
t/t4124-apply-ws-rule.sh | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index f83322e..0db9b59 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -148,4 +148,22 @@ do
done
done
+create_patch () {
+ sed -e "s/_/ /" <<-\EOF
+ diff --git a/target b/target
+ index e69de29..8bd6648 100644
+ --- a/target
+ +++ b/target
+ @@ -0,0 +1 @@
+ +A line with trailing whitespace and no newline_
+ \ No newline at end of file
+ EOF
+}
+
+test_expect_failure 'trailing whitespace & no newline at the end of file' '
+ >target &&
+ create_patch | git apply --whitespace=fix - &&
+ git diff --check -- target
+'
+
test_done
--
1.6.3.2.370.g6bb4.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [BUG] apply: test for trailing whitespace & no new line bug
@ 2009-06-22 11:49 y
0 siblings, 0 replies; 2+ messages in thread
From: y @ 2009-06-22 11:49 UTC (permalink / raw)
To: git; +Cc: SZEDER Gábor
From: SZEDER Gábor <szeder@ira.uka.de>
If a patch adds a new line to the end of a file and this line ends
with trailing whitespace but has no newline, then 'git apply
--whitespace=fix' does not remove the trailing whitespace from that
line.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
Noticed last week, but couldn't fix it myself during the weekend.
t/t4124-apply-ws-rule.sh | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index f83322e..0db9b59 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -148,4 +148,22 @@ do
done
done
+create_patch () {
+ sed -e "s/_/ /" <<-\EOF
+ diff --git a/target b/target
+ index e69de29..8bd6648 100644
+ --- a/target
+ +++ b/target
+ @@ -0,0 +1 @@
+ +A line with trailing whitespace and no newline_
+ \ No newline at end of file
+ EOF
+}
+
+test_expect_failure 'trailing whitespace & no newline at the end of file' '
+ >target &&
+ create_patch | git apply --whitespace=fix - &&
+ git diff --check -- target
+'
+
test_done
--
1.6.3.2.370.g6bb4.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-22 11:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-22 11:49 [BUG] apply: test for trailing whitespace & no new line bug y
-- strict thread matches above, loose matches on Subject: below --
2009-06-22 11:49 y
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).