From 0de0e1ee0efaef94c033d3aaae80c8548cdfa82b Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Sat, 25 Sep 2021 12:38:57 +0200 Subject: [PATCH] codemirror_sync: Use reset and checkout instead of restore (#9396) The git version we are using for CI is too old. Signed-off-by: Julien Pivotto --- scripts/sync_codemirror.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/sync_codemirror.sh b/scripts/sync_codemirror.sh index 9b04f9368..82362d2cf 100755 --- a/scripts/sync_codemirror.sh +++ b/scripts/sync_codemirror.sh @@ -107,13 +107,13 @@ process_repo() { git add . for excluded_dir in ${excluded_dirs}; do - git restore --staged "${excluded_dir}/*" - git restore "${excluded_dir}/*" + git reset -- "${excluded_dir}/*" + git checkout -- "${excluded_dir}/*" done for excluded_file in ${excluded_files}; do - git restore --staged "${excluded_file}" - git restore "${excluded_file}" + git reset -- "${excluded_file}" + git checkout -- "${excluded_file}" done if [[ -n "$(git status --porcelain)" ]]; then