diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-03-08 17:12:33 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-12 13:45:16 -0700 |
| commit | 83c094ad0dd2104adbbec034f802dceb1d052981 (patch) | |
| tree | c4c552a928095b0af884c901504e820a62710cb7 /read-cache.c | |
| parent | be0d9d532326a81d761913e3ec9e2e7c62eeca7b (diff) | |
| download | git-83c094ad0dd2104adbbec034f802dceb1d052981.tar.gz | |
untracked cache: save to an index extension
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 8d71860f69..3a058d008a 100644 --- a/read-cache.c +++ b/read-cache.c @@ -39,6 +39,7 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ #define CACHE_EXT_LINK 0x6c696e6b /* "link" */ +#define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */ /* changes that can be kept in $GIT_DIR/index (basically all extensions) */ #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ @@ -2047,6 +2048,17 @@ static int do_write_index(struct index_state *istate, int newfd, if (err) return -1; } + if (!strip_extensions && istate->untracked) { + struct strbuf sb = STRBUF_INIT; + + write_untracked_extension(&sb, istate->untracked); + err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED, + sb.len) < 0 || + ce_write(&c, newfd, sb.buf, sb.len) < 0; + strbuf_release(&sb); + if (err) + return -1; + } if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st)) return -1; |