flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure file ordering matches in both invocations of ls

Browse Source
This commit is contained in:
Tom "Ravi" Hale
2018-09-14 19:20:39 +07:00
parent e46a7c3309
commit 4adf771492
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/git/shell_shortcuts.sh
View File

@@ -112,10 +112,13 @@ if [ "$shell_ls_aliases_enabled" = "true" ] && which ruby > /dev/null 2>&1; then
unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1 unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
function ls_with_file_shortcuts { function ls_with_file_shortcuts {
local ll_output local ll_output
local ll_command # Ensure sort ordering of the two invocations is the same
if [ "$_ls_bsd" != "BSD" ]; then if [ "$_ls_bsd" != "BSD" ]; then
ll_output="$(\ls -lhv --group-directories-first --color "$@")" ll_command=(\ls -hv --group-directories-first)
ll_output="$("${ll_command[@]}" -l --color "$@")"
else else
ll_output="$(CLICOLOR_FORCE=1 \ls -l -G "$@")" ll_command=(\ls)
ll_output="$(CLICOLOR_FORCE=1 "${ll_command[@]}" -lG "$@")"
fi fi
if [[ $shell == "zsh" ]]; then if [[ $shell == "zsh" ]]; then
@@ -187,10 +190,14 @@ EOF
local ll_files='' local ll_files=''
local file='' local file=''
# XXX FIXME XXX
# There is a race condition here: If a file is removed between the above
# and this second call of `ls` then the $e# variables can refer to the
# wrong files.
if [ -z $_ls_bsd ]; then if [ -z $_ls_bsd ]; then
ll_files="$(\ls -v --group-directories-first --color=never "$@")" ll_files="$(QUOTING_STYLE=literal "${ll_command[@]}" --color=never "$@")"
else else
ll_files="$(\ls "$@")" ll_files="$("${ll_command[@]}" "$@")"
fi fi
local IFS=$'\n' local IFS=$'\n'