1. 30 Sep, 2015 1 commit
    • index: also try conflict mode when inserting · 21515f22
      When we do not trust the on-disk mode, we use the mode of an existing
      index entry.  This allows us to preserve executable bits on platforms
      that do not honor them on the filesystem.
      
      If there is no stage 0 index entry, also look at conflicts to attempt
      to answer this question:  prefer the data from the 'ours' side, then
      the 'theirs' side before falling back to the common ancestor.
      Edward Thomson committed
  2. 29 Sep, 2015 1 commit
  3. 28 Sep, 2015 1 commit
  4. 27 Sep, 2015 2 commits
  5. 25 Sep, 2015 2 commits
    • Merge pull request #3439 from bisho/master · a8d0b4de
      Fix binary diffs
      Edward Thomson committed
    • Fix binary diffs · e4b2b919
      git expects an empty line after the binary data:
      
      literal X
      ...binary data...
      <empty_line>
      
      The last literal block of the generated patches were not containing the required empty line. Example:
      
      	diff --git a/binary_file b/binary_file
      	index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
      	GIT binary patch
      	literal 8
      	Pc${NM&PdElPvrst3ey5{
      
      	literal 6
      	Nc${NM%g@i}0ssZ|0lokL
      	diff --git a/binary_file2 b/binary_file2
      	index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
      	GIT binary patch
      	literal 8
      	Pc${NM&PdElPvrst3ey5{
      
      	literal 13
      	Sc${NMEKbZyOexL+Qd|HZV+4u-
      
      git apply of that diff results in:
      
      	error: corrupt binary patch at line 9: diff --git a/binary_file2 b/binary_file2
      	fatal: patch with only garbage at line 10
      
      The proper formating is:
      
      	diff --git a/binary_file b/binary_file
      	index 3f1b3f9098131cfecea4a50ff8afab349ea66d22..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
      	GIT binary patch
      	literal 8
      	Pc${NM&PdElPvrst3ey5{
      
      	literal 6
      	Nc${NM%g@i}0ssZ|0lokL
      	diff --git a/binary_file2 b/binary_file2
      	index 31be99be19470da4af5b28b21e27896a2f2f9ee2..86e5c1008b5ce635d3e3fffa4434c5eccd8f00b6 100644
      	GIT binary patch
      	literal 8
      	Pc${NM&PdElPvrst3ey5{
      
      	literal 13
      	Sc${NMEKbZyOexL+Qd|HZV+4u-
      Guille -bisho- committed
  6. 24 Sep, 2015 2 commits
  7. 23 Sep, 2015 3 commits
  8. 21 Sep, 2015 1 commit
  9. 18 Sep, 2015 8 commits
  10. 17 Sep, 2015 8 commits
  11. 16 Sep, 2015 6 commits
  12. 14 Sep, 2015 3 commits
  13. 13 Sep, 2015 2 commits