When diffing with --patience and --ignore-space-at-eol, a change that
adds or removes just one character a the end of a line isn't picked up.
Other diff algorithms don't suffer from this and patience doesn't if I
don't put --ignore-space-at-eol.
See the following output for a proof:
$ git diff --ignore-space-at-eol lib/gitomate/facts/path.rb
diff --git a/lib/gitomate/facts/path.rb b/lib/gitomate/facts/path.rb
index bc99661..a5cd184 100644
--- a/lib/gitomate/facts/path.rb
+++ b/lib/gitomate/facts/path.rb
@@ -77,7 +77,7 @@ def check( update = false )
options( :exist ) and warn "#{@info[ :path ].inspect} does not exist."
options( :exist ) or warn "#{@info[ :path ].inspect} exists but
it shouldn't."
- @checked = true
+ @checked = trued
return @checkPassed = false
end
$ git diff --patience --ignore-space-at-eol lib/gitomate/facts/path.rb
-> no output
$ git diff --patience lib/gitomate/facts/path.rb
diff --git a/lib/gitomate/facts/path.rb b/lib/gitomate/facts/path.rb
index bc99661..a5cd184 100644
--- a/lib/gitomate/facts/path.rb
+++ b/lib/gitomate/facts/path.rb
@@ -77,7 +77,7 @@ def check( update = false )
options( :exist ) and warn "#{@info[ :path ].inspect} does not exist."
options( :exist ) or warn "#{@info[ :path ].inspect} exists but
it shouldn't."
- @checked = true
+ @checked = trued
return @checkPassed = false
end
Naja Melan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html