@matheusbsbs / matheus-bagliano / commits / 134047b500

fsmonitor: query watchman with right valid json

In rare circumstances where the current git index does not carry the last_update_token, the fsmonitor v2 hook will be invoked with an empty string which would caused the final rendered json to be invalid. ["query", "/path/to/my/git/repository/", { "since": , "fields": ["name"], "expression": ["not", ["dirname", ".git"]] }] Which will left user with the following error message > git status failed to parse command from stdin: line 2, column 13, position 67: unexpected token near ',' Watchman: command returned no output. Falling back to scanning... Hide the "since" field in json query when "last_update_token" is empty. Co-authored-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Son Luong Ngoc <sluongng@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Son Luong Ngoc committed Jun 7, 2022 at 13:14 UTC 134047b500fd6da079c4aad72c456cd76afe6771

1 file changed +3 -2

templates/hooks--fsmonitor-watchman.sample

+3 -2

@@ -86,12 +86,13 @@ sub watchman_query {

86 # recency index to select candidate nodes and "fields" to limit the

87 # output to file names only. Then we're using the "expression" term to

88 # further constrain the results.

89 + my $last_update_line = "";

90 if (substr($last_update_token, 0, 1) eq "c") {

91 $last_update_token = "\"$last_update_token\"";

92 + $last_update_line = qq[\n"since": $last_update_token,];

93 }

94 my $query = <<" END";

93 - ["query", "$git_work_tree", {

94 - "since": $last_update_token,

95 + ["query", "$git_work_tree", {$last_update_line

96 "fields": ["name"],

97 "expression": ["not", ["dirname", ".git"]]

98 }]