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

Fail git status if .git not in cwd or parent directory

Browse Source
This commit is contained in:
Nathan Broadbent
2012-09-19 21:30:07 +12:00
parent dc2d93453b
commit 197dcfc74f
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/git/status_shortcuts.sh
View File

@@ -17,6 +17,11 @@
# 1 || staged, 2 || unmerged, 3 || unstaged, 4 || untracked
# --------------------------------------------------------------------
git_status_shortcuts() {
# Fail if not a git repo
if ! find_in_cwd_or_parent ".git" > /dev/null; then
echo -e "\e[31mNot a git repository (or any of the parent directories)\e[0m"
return 1
fi
zsh_compat # Ensure shwordsplit is on for zsh
git_clear_vars
# Run ruby script, store output
@@ -120,7 +125,7 @@ scmb_expand_args() {
if [ "$first" -eq 1 ]; then first=0; else printf '\t'; fi
eval printf '%s' "\"\$$git_env_char$arg\""
elif [[ "$arg" =~ ^[0-9]+-[0-9]+$ ]]; then # Expand ranges into $e{*} variables
for i in $(eval echo {${arg/-/..}}); do
if [ "$first" -eq 1 ]; then first=0; else printf '\t'; fi
eval printf '%s' "\"\$$git_env_char$i\""
@@ -148,7 +153,7 @@ git_clear_vars() {
# Shortcuts for resolving merge conflicts.
_git_resolve_merge_conflict() {
_git_resolve_merge_conflict() {
if [ -n "$2" ]; then
# Expand args and process resulting set of files.
IFS=$'\t'