Re: What's cooking in git.git (Jun 2019, #07; Fri, 28)

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 2, 2019, 20:44 UTC
Message-ID: <xmqqftno2mku.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <xmqqzhm173sp.fsf@gitster-ct.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 15 quoted lines

> * nd/index-dump-in-json (2019-06-26) 11 commits
>  - SQUASH???
>  - t3008: use the new SINGLE_CPU prereq
>  - read-cache.c: dump "IEOT" extension as json
>  - read-cache.c: dump "EOIE" extension as json
>  - resolve-undo.c: dump "REUC" extension as json
>  - fsmonitor.c: dump "FSMN" extension as json
>  - split-index.c: dump "link" extension as json
>  - dir.c: dump "UNTR" extension as json
>  - cache-tree.c: dump "TREE" extension as json
>  - read-cache.c: dump common extension info in json
>  - ls-files: add --json to dump the index
>
>  "ls-files" learned "--debug-json" option to dump the contents and
>  the extensions of the index file.

The t3011 test in this topic seems timing-dependent-flaky.

When we get "not ok 3 - ls-files --json, split index", the "filtered" one looks like this:

$ diff -U999 t/t3011/split-index filtered --- t/t3011/split-index 2019-07-02 13:17:19.676719212 -0700 +++ filtered 2019-07-02 13:40:32.068638361 -0700

@@ -1,39 +1,19 @@
 {
   "version": 2,
   "oid": <string>,
   "mtime_sec": <number>,
   "mtime_nsec": <number>,
   "entries": [
-    {
-      "id": 0,
-      "name": "",
-      "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>
-    }
   ],
   "extensions": {
     "link": {
       "file_offset": <number>,
       "ext_size": <number>,
       "oid": <string>,
       "delete_bitmap": [
       ],
       "replace_bitmap": [
-        0
       ]
     }
   }
 }