Re: [PATCH 3/4] convert: Inhibit contraction of foreign $Id$ during stats.

diff --git a/builtin/apply.c b/builtin/apply.c
index 3af4ae0..25adef8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c

@@ -1759,7 +1759,7 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)

       case S_IFREG:
               if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
                       return error("unable to open or read %s", path);
-               convert_to_git(path, buf->buf, buf->len, buf, 0);
+               convert_to_git(path, buf->buf, buf->len, buf, 0, 0);

               return 0;
       default:
               return -1;

diff --git a/builtin/blame.c b/builtin/blame.c
index fc15863..16f7f00 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c

@@ -2050,7 +2050,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con

               if (strbuf_read(&buf, 0, 0) < 0)
                       die_errno("failed to read from stdin");
       }
-       convert_to_git(path, buf.buf, buf.len, &buf, 0);
+       convert_to_git(path, buf.buf, buf.len, &buf, 0, 0);

       origin->file.ptr = buf.buf;
       origin->file.size = buf.len;
       pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);

diff --git a/cache.h b/cache.h
index 89f6a40..b62c462 100644
--- a/cache.h
+++ b/cache.h

@@ -556,6 +556,11 @@ enum safe_crlf {

       SAFE_CRLF_WARN = 2,
 };

+enum ident_mode {
+       IDENT_MODE_FALSE = 0,