Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
read-cache.c | 2 +-
resolve-undo.c | 30 +++++++++++++++++-
resolve-undo.h | 4 ++-
t/t3011-ls-files-json.sh | 20 ++++++++++++
t/t3011/rerere (new) | 66 ++++++++++++++++++++++++++++++++++++++++
5 files changed, 119 insertions(+), 3 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index a70df4b0a5..e5183636fc 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1719,7 +1719,7 @@ static int read_index_extension(struct index_state *istate,
istate->cache_tree = cache_tree_read(data, sz, istate->jw);
break;
case CACHE_EXT_RESOLVE_UNDO:
- istate->resolve_undo = resolve_undo_read(data, sz);
+ istate->resolve_undo = resolve_undo_read(data, sz, istate->jw);
break;
case CACHE_EXT_LINK:
ret = read_link_extension(istate, data, sz);
diff --git a/resolve-undo.c b/resolve-undo.c
index 236320f179..68921e3dfe 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "dir.h"
+#include "json-writer.h"
#include "resolve-undo.h"
#include "string-list.h"
@@ -49,7 +50,30 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
}
}
-struct string_list *resolve_undo_read(const char *data, unsigned long size)
+static void dump_resolve_undo(struct json_writer *jw,
+ const char *path,
+ const struct resolve_undo_info *ui)
+{
+ int i;
+
+ if (!jw)
+ return;
+
+ jw_array_inline_begin_object(jw);
+ jw_object_string(jw, "path", path);
+
+ jw_object_inline_begin_array(jw, "stages");
+ for (i = 0; i < 3; i++) {
+ jw_array_inline_begin_object(jw);
+ jw_object_filemode(jw, "mode", ui->mode[i]);
+ jw_object_string(jw, "oid", oid_to_hex(&ui->oid[i]));
+ jw_end(jw);
+ }
+ jw_end(jw);
+}
+
+struct string_list *resolve_undo_read(const char *data, unsigned long size,
+ struct json_writer *jw)
{
struct string_list *resolve_undo;
size_t len;
@@ -59,6 +83,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
resolve_undo = xcalloc(1, sizeof(*resolve_undo));
resolve_undo->strdup_strings = 1;
+ jw_object_inline_begin_array_gently(jw, "entries");
while (size) {
struct string_list_item *lost;
@@ -94,7 +119,10 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
size -= rawsz;
data += rawsz;
}
+
+ dump_resolve_undo(jw, lost->string, ui);
}
+ jw_end_gently(jw);
return resolve_undo;
error:
diff --git a/resolve-undo.h b/resolve-undo.h
index 2b3f0f901e..46b4e93a7e 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -3,6 +3,8 @@
#include "cache.h"
+struct json_writer;
+
struct resolve_undo_info {
unsigned int mode[3];
struct object_id oid[3];
@@ -10,7 +12,7 @@ struct resolve_undo_info {
void record_resolve_undo(struct index_state *, struct cache_entry *);
void resolve_undo_write(struct strbuf *, struct string_list *);
-struct string_list *resolve_undo_read(const char *, unsigned long);
+struct string_list *resolve_undo_read(const char *, unsigned long, struct json_writer *);
void resolve_undo_clear_index(struct index_state *);
int unmerge_index_entry_at(struct index_state *, int);
void unmerge_index(struct index_state *, const struct pathspec *);
diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh
index 25215f83ae..dc57138f5b 100755
--- a/t/t3011-ls-files-json.sh
+++ b/t/t3011-ls-files-json.sh
@@ -70,4 +70,24 @@ test_expect_success 'ls-files --json, fsmonitor extension ' '
)
'
+test_expect_success 'ls-files --json, rerere extension' '
+ git init rerere &&
+ (
+ cd rerere &&
+ mkdir fi &&
+ test_commit initial fi/le first &&
+ git branch side &&
+ test_commit second fi/le second &&
+ git checkout side &&
+ test_commit third fi/le third &&
+ git checkout master &&
+ git config rerere.enabled true &&
+ test_must_fail git merge side &&
+ echo resolved >fi/le &&
+ git add fi/le &&
+ cp ../filter.sed . &&
+ compare_json rerere
+ )
+'
+
test_done
diff --git a/t/t3011/rerere b/t/t3011/rerere
new file mode 100644
index 0000000000..a8ec4b16ee
--- /dev/null
+++ b/t/t3011/rerere
@@ -0,0 +1,66 @@
+{
+ "version": 2,
+ "oid": <string>,
+ "mtime_sec": <number>,
+ "mtime_nsec": <number>,
+ "entries": [
+ {
+ "id": 0,
+ "name": "fi/le",
+ "mode": "100644",
+ "flags": 0,
+ "oid": <string>,
+ "stat": {
+ "ctime_sec": <number>,
+ "ctime_nsec": <number>,
+ "mtime_sec": <number>,
+ "mtime_nsec": <number>,
+ "device": <number>,
+ "inode": <number>,
+ "uid": <number>,
+ "gid": <number>,
+ "size": 9
+ },
+ "file_offset": <number>
+ }
+ ],
+ "extensions": {
+ "TREE": {
+ "file_offset": <number>,
+ "ext_size": <number>,
+ "root": {
+ "oid": null,
+ "subdirs": [
+ {
+ "name": "fi",
+ "oid": null,
+ "subdirs": [
+ ]
+ }
+ ]
+ }
+ },
+ "REUC": {
+ "file_offset": <number>,
+ "ext_size": <number>,
+ "entries": [
+ {
+ "path": "fi/le",
+ "stages": [
+ {
+ "mode": "100644",
+ "oid": <string>
+ },
+ {
+ "mode": "100644",
+ "oid": <string>
+ },
+ {
+ "mode": "100644",
+ "oid": <string>
+ }
+ ]
+ }
+ ]
+ }
+ }
--
2.22.0.rc0.322.g2b0371e29a
