Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
git-rfc3161
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CSG
git-rfc3161
Commits
4035b46e
Commit
4035b46e
authored
18 years ago
by
Junio C Hamano
Browse files
Options
Downloads
Patches
Plain Diff
t4015: work-around here document problem on Cygwin.
Signed-off-by:
Junio C Hamano
<
junio@twinsun.com
>
parent
23bed43d
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
t/t4015-diff-whitespace.sh
+6
-6
6 additions, 6 deletions
t/t4015-diff-whitespace.sh
with
6 additions
and
6 deletions
t/t4015-diff-whitespace.sh
+
6
−
6
View file @
4035b46e
...
...
@@ -51,13 +51,13 @@ test_expect_success "Ray's example with -w" 'diff -u expect out'
git-diff
-b
>
out
test_expect_success
"Ray's example with -b"
'diff -u expect out'
cat
<<
EOF
> x
tr
'Q'
'\015'
<<
EOF
> x
whitespace at beginning
whitespace change
whitespace in the middle
whitespace at end
unchanged line
CR at end
CR at end
Q
EOF
git-update-index x
...
...
@@ -71,7 +71,7 @@ unchanged line
CR at end
EOF
cat
<<
EOF
> expect
tr
'Q'
'\015'
<<
EOF
> expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
...
...
@@ -86,7 +86,7 @@ index d99af23..8b32fb5 100644
+white space in the middle
+whitespace at end
unchanged line
-CR at end
-CR at end
Q
+CR at end
EOF
git-diff
>
out
...
...
@@ -99,7 +99,7 @@ EOF
git-diff
-w
>
out
test_expect_success
'another test, with -w'
'diff -u expect out'
cat
<<
EOF
> expect
tr
'Q'
'\015'
<<
EOF
> expect
diff --git a/x b/x
index d99af23..8b32fb5 100644
--- a/x
...
...
@@ -113,7 +113,7 @@ index d99af23..8b32fb5 100644
+white space in the middle
+whitespace at end
unchanged line
-CR at end
-CR at end
Q
+CR at end
EOF
git-diff
-b
>
out
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment