From 00e240f846a5f7a9202e7726f8d748cf7485b5cf Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 11 Apr 2014 10:58:11 +0200 Subject: [PATCH] fix gwip alias for some BSD flavors, fixes #2692 --- plugins/git/git.plugin.zsh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 9f7819df3..356ae084b 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -149,7 +149,10 @@ function work_in_progress() { fi } # these alias commit and uncomit wip branches -alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"' +# first though, check xargs flavor for -r flag +echo | xargs -r &>/dev/null && XARGS_OPTS="-r" +alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 git rm; git commit -m \"--wip--\"" +unset XARGS_OPTS alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1' # these alias ignore changes to file