0

Git keeps adding the same changeset, which looks like this:

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-       android:text="@string/hello" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+
 </LinearLayout>
\ No newline at end of file

The file is not open in any editor, and every time I discard changes by doing a git checkoutor by using the github tool, the changes reappear without me even doing anything. Committing the files changes nothing, the same changeset reappears immediately.

How do I keep it from doing this?

Thom Wiggers
  • 6,938
  • 1
  • 39
  • 65

1 Answers1

0

Whole file is always changed? Line endings! (read it as LINE ENDINGS!!!)

You can read git's manual on line ending conversion, Github also as a nice detailed explanation on this, but to put it basically:

  • Your editor should use expected line endings (most people stick with the OS default)
  • Your core.autocrlf in gitconfig should follow the editor's option.

You might need to issue a commit fixing the line issue if you made a commit with the wrong line ending (i.e. the git repo should always be in LF).

Daniel
  • 72
  • 5
  • And it is also only with these files, not any other – Thom Wiggers Jun 05 '12 at 13:08
  • @TheGuyOfDoom, are you sure there's [nothing interested being executed via `.gitattributes`](http://stackoverflow.com/a/2059393/720999)? – kostix Jun 05 '12 at 13:50
  • well, gitattributes was empty. It turned out it had to do with the crlf stuff though, but core.autocrlf was not enough to fix it. I made a whole bunch of changes but eventually ended up with a lf only repo and lost the conflicts. – Thom Wiggers Jun 05 '12 at 14:16
  • I could ninja edit to mention the following: you don't need to edit the file to get a bad checkout, only have a bad repo! E.g.: If you move a repo between OSes you can get this problem. – Daniel Jun 05 '12 at 18:10