On 06/24, Nguyễn Thái Ngọc Duy wrote: > So far we don't have a command to basically dump the index file out, > with all its glory details. Checking some info, for example, stat > time, usually involves either writing new code or firing up "xxd" and > decoding values by yourself. > > This --json is supposed to help that. It dumps the index in a human > readable format but also easy to be processed with tools. And it will > print almost enough info to reconstruct the index later. > > In this patch we only dump the main part, not extensions. But at the > end of the series, the entire index is dumped. The end result could be > very verbose even on a small repository such as git.git. > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > Documentation/git-ls-files.txt | 5 +++ > builtin/ls-files.c | 38 +++++++++++++--- > cache.h | 2 + > json-writer.c | 22 ++++++++++ > json-writer.h | 23 ++++++++++ > read-cache.c | 72 ++++++++++++++++++++++++++++++- > t/t3011-ls-files-json.sh (new +x) | 44 +++++++++++++++++++ > t/t3011/basic (new) | 67 ++++++++++++++++++++++++++++ > 8 files changed, 265 insertions(+), 8 deletions(-) > > [...] > > diff --git a/t/t3011-ls-files-json.sh b/t/t3011-ls-files-json.sh > new file mode 100755 > index 0000000000..97bcd814be > --- /dev/null > +++ b/t/t3011-ls-files-json.sh > @@ -0,0 +1,44 @@ > +#!/bin/sh > + > +test_description='ls-files dumping json' > + > +. ./test-lib.sh > + > +strip_number() { > + for name; do > + echo 's/\("'$name'":\) [0-9]\+/\1 <number>/' >>filter.sed > + done > +} > + > +strip_string() { > + for name; do > + echo 's/\("'$name'":\) ".*"/\1 <string>/' >>filter.sed > + done > +} > + > +compare_json() { > + git ls-files --debug-json >json && > + sed -f filter.sed json >filtered && > + test_cmp "$TEST_DIRECTORY"/t3011/"$1" filtered > +} > + > +test_expect_success 'setup' ' > + mkdir sub && > + echo one >one && > + git add one && > + echo 2 >sub/two && > + git add sub/two && > + > + echo intent-to-add >ita && > + git add -N ita && > + > + strip_number ctime_sec ctime_nsec mtime_sec mtime_nsec && > + strip_number device inode uid gid file_offset ext_size && > + strip_string oid ident > +' > + > +test_expect_success 'ls-files --json, main entries' ' > + compare_json basic > +' > + > +test_done > diff --git a/t/t3011/basic b/t/t3011/basic > new file mode 100644 > index 0000000000..9436445d90 > --- /dev/null > +++ b/t/t3011/basic > @@ -0,0 +1,67 @@ > +{ > + "version": 3, This will break the test suite when 'GIT_TEST_INDEX_VERSION' is set to 4 for example. I think this applies to a few other tests in later patches as well. > + "oid": <string>, > + "mtime_sec": <number>, > + "mtime_nsec": <number>, > + "entries": [ > + { > + "id": 0, > + "name": "ita", > + "mode": "100644", > + "flags": 536887296, > + "extended_flags": true, > + "intent_to_add": true, > + "oid": <string>, > + "stat": { > + "ctime_sec": <number>, > + "ctime_nsec": <number>, > + "mtime_sec": <number>, > + "mtime_nsec": <number>, > + "device": <number>, > + "inode": <number>, > + "uid": <number>, > + "gid": <number>, > + "size": 0 > + }, > + "file_offset": <number> > + }, > + { > + "id": 1, > + "name": "one", > + "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": 4 > + }, > + "file_offset": <number> > + }, > + { > + "id": 2, > + "name": "sub/two", > + "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": 2 > + }, > + "file_offset": <number> > + } > + ] > +} > -- > 2.22.0.rc0.322.g2b0371e29a >