Skip to content

Commit

Permalink
Fix another case where git tests were hanging
Browse files Browse the repository at this point in the history
  • Loading branch information
mawww committed May 12, 2024
1 parent 7be22f1 commit 0e92b3f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion rc/tools/git.kak
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ define-command -params 1.. \
execute-keys <a-l><semicolon><a-?>^commit<ret><a-semicolon>
} catch %{
# Missing commit line, assume it is an uncommitted change.
execute-keys <a-l><semicolon><a-?>\A<ret><a-semicolon>
execute-keys <a-l><semicolon>Gg<a-semicolon>
}
require-module diff
try %{
Expand Down
2 changes: 1 addition & 1 deletion test/run
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ ui_out() {
-until)
shift
while read -r event <&4; do
[ "$event" == "$1" ] && break
[ "$event" = "$1" ] && break
done
;;
-until-grep)
Expand Down
4 changes: 2 additions & 2 deletions test/tools/git/blame-in-diff/script
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }'
ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'

# We've jumped to the new version of line 2. Move to the old version so we
# can annotate the old file.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }'
ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }'
while ui_out -until-grep '"draw_status"' | grep '\[fifo\]'; do :; done > /dev/null

# We should have jumped to the old version of line 2, assert on kak_selection.
ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }'
Expand Down

0 comments on commit 0e92b3f

Please sign in to comment.