diff --git a/lib/git/fallback/status_shortcuts_shell.sh b/lib/git/fallback/status_shortcuts_shell.sh index 8a84fe1..ba30805 100644 --- a/lib/git/fallback/status_shortcuts_shell.sh +++ b/lib/git/fallback/status_shortcuts_shell.sh @@ -120,7 +120,7 @@ _gs_output_file_group() { for i in ${stat_grp[$1]}; do # Print colored hashes & files based on modification groups local c_group="\e[0;$(eval echo -e \$c_grp_$1)" - + # Deduce relative path based on current working directory if [ -z "$project_root" ]; then relative="${stat_file[$i]}" @@ -128,7 +128,7 @@ _gs_output_file_group() { dest="$project_root/${stat_file[$i]}" relative="$(_gs_relative_path "$PWD" "$dest" )" fi - + if [[ $f -gt 10 && $e -lt 10 ]]; then local pad=" "; else local pad=""; fi # (padding) echo -e "$c_hash#$c_rst ${stat_col[$i]}${stat_msg[$i]}:\ $pad$c_dark [$c_rst$e$c_dark] $c_group$relative$c_rst" diff --git a/lib/git/status_shortcuts.sh b/lib/git/status_shortcuts.sh index 89bb5be..c637955 100644 --- a/lib/git/status_shortcuts.sh +++ b/lib/git/status_shortcuts.sh @@ -74,7 +74,6 @@ git_add_shortcuts() { # Does nothing if no args are given. git_silent_add_shortcuts() { if [ -n "$1" ]; then - function process { file=$1 # Use 'git rm' if file doesn't exist and 'ga_auto_remove' is enabled. @@ -86,7 +85,7 @@ git_silent_add_shortcuts() { echo -e "# add '$file'" fi } - + # Expand args and process resulting set of files. eval for file in $(git_expand_args "$@")\; do process "\$file"\; done echo "#" diff --git a/test/lib/git/repo_index_test.sh b/test/lib/git/repo_index_test.sh index e4ea2be..85d679a 100755 --- a/test/lib/git/repo_index_test.sh +++ b/test/lib/git/repo_index_test.sh @@ -30,9 +30,7 @@ oneTimeSetUp() { git_index_file="$GIT_REPO_DIR/.git_index" silentGitCommands - - echo "Using repo dir $GIT_REPO_DIR" - + cd $GIT_REPO_DIR # Setup test repos in temp repo dir for repo in github bitbucket source_forge; do @@ -93,7 +91,7 @@ index_no_newlines() { test_repo_index_command() { git_index --rebuild > /dev/null - + # Test that all repos are detected, and sorted alphabetically assertIncludes "$(index_no_newlines)" "bitbucket.*\ blue_submodule.*\