test(freset): update freset test

scripts/freset

@@ -80,11 +80,11 @@ if [[ "${reset_type}" == "commit" ]]; then
   [[ -z "${selected_commit}" ]] && exit 1
   [[ -z "${confirm}" ]] && confirm=$(get_confirmation "Reset HEAD to ${selected_commit} ${reset_option}?")
   [[ "${confirm}" != 'y' ]] && exit 1
-  /usr/bin/git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_commit}" "${reset_option}"
+  git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_commit}" "${reset_option}"
 else
   while IFS= read -r line; do
     selected_files+=("${line}")
   done < <(get_modified_file 'select files to unstage' 'staged')
   [[ "${#selected_files[@]}" -eq 0 ]] && exit 1
-  /usr/bin/git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_files[@]}"
+  git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_files[@]}"
 fi

tests/freset.bats

@@ -40,19 +40,12 @@ select_files() {
 }
 
 @test "freset select commit" {
-  if ! "${BATS_TEST_DIRNAME}"/../dotbare log &>/dev/null; then
-    skip
-  fi
   run select_commit
-  [ "${status}" -eq 129 ]
-  [[ "${output}" =~ "freset_commit" ]]
+  [[ "${output}" =~ "reset freset_commit --mixed" ]]
 }
 
 @test "freset select files" {
-  if ! "${BATS_TEST_DIRNAME}"/../dotbare log &>/dev/null; then
-    skip
-  fi
   run select_files
-  [ "${status}" -eq 128 ]
+  [[ "${output}" =~ "reset" ]]
   [[ "${output}" =~ "freset_file" ]]
 }

tests/fzf

@@ -36,9 +36,12 @@ elif [[ "$*" =~ "--header=select a commit to rename --no-multi" ]] && [[ "$*" =~
 elif [[ "$*" =~ "--header=select tracked files to edit" ]]; then
   # dotbare fedit -- "./fedit.bats" @test "fedit edit files"
   exit
-elif [[ "$*" =~ '--no-multi --header=select the target commit for HEAD' ]] && [[ "$*" =~ "show --color" ]]; then
+elif [[ "$*" =~ '--header=select the target commit for HEAD --no-multi' ]] && [[ "$*" =~ "show --color" ]]; then
   # dotbare freset --commit -y -- "./freset.bats" @test "freset select commit"
-  echo "--freset_commit"
+  echo "freset_commit"
+elif [[ "$*" =~ "--header=select files to unstage" ]] && [[ "$*" =~ "diff HEAD --color=always" ]]; then
+  # dotbare freset -- "./freset.bats" @test "freset select files"
+  echo "-- freset_file"
 elif [[ "$*" =~ "--no-multi --header=commit --flog_reset" ]]; then
   # dotbare flog -- "./flog.bats" @test "flog checkout routing"
   echo "exit"
@@ -57,9 +60,6 @@ elif [[ "$*" =~ '--header=select stash to delete' ]] && [[ "$*" =~ "show -p __ -
 elif [[ "$*" =~ '--header=select stash to apply' ]] && [[ "$*" =~ "show -p __ --color=always" ]]; then
   # dotbare fstash -- "./fstash.bats" @test "fstash apply stash"
   echo "fstash_apply"
-elif [[ "$*" =~ "--header=select files to unstage" ]] && [[ "$*" =~ "diff HEAD --color=always" ]]; then
-  # dotbare freset -- "./freset.bats" @test "freset select files"
-  echo "-- freset_file"
 else
   echo "$@"
 fi