@matheusbsbs / matheus-bagliano / commits / bd3a5b5ee5
Fork 0

Mark places that need blob munging later for CRLF conversion.

Here's a patch that I think we can merge right now. There may be other places that need this, but this at least points out the three places that read/write working tree files for git update-index, checkout and diff respectively. That should cover a lot of it [jc: git-apply uses an entirely different codepath both for reading and writing]. Some day we can actually implement it. In the meantime, this points out a place for people to start. We *can* even start with a really simple "we do CRLF conversion automatically, regardless of filename" kind of approach, that just look at the data (all three cases have the _full_ file data already in memory) and says "ok, this is text, so let's convert to/from DOS format directly". THAT somebody can write in ten minutes, and it would already make git much nicer on a DOS/Windows platform, I suspect. And it would be totally zero-cost if you just make it a config option (but please make it dynamic with the _default_ just being 0/1 depending on whether it's UNIX/Windows, just so that UNIX people can _test_ it easily). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Feb 13, 2007 at 09:23 UTC bd3a5b5ee5cc627dc278d2028fb017161705fe02
3 files changed +3
diff.c
+1
@@ -1364,6 +1364,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
1364 s->data = xmmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
1365 close(fd);
1366 s->should_munmap = 1;
1367 + /* FIXME! CRLF -> LF conversion goes here, based on "s->path" */
1368 }
1369 else {
1370 char type[20];
entry.c
+1
@@ -89,6 +89,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
89 return error("git-checkout-index: unable to create file %s (%s)",
90 path, strerror(errno));
91 }
92 + /* FIXME: LF -> CRLF conversion goes here, based on "ce->name" */
93 wrote = write_in_full(fd, new, size);
94 close(fd);
95 free(new);
sha1_file.c
+1
@@ -2091,6 +2091,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, con
2091
2092 if (!type)
2093 type = blob_type;
2094 + /* FIXME: CRLF -> LF conversion here for blobs! We'll need the path! */
2095 if (write_object)
2096 ret = write_sha1_file(buf, size, type, sha1);
2097 else