From 4fba1ce6d2f4232e63304080241af7b57c724329 Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Sat, 5 Jan 2013 14:55:53 -0800 Subject: [PATCH] aliases: git: consistent behavior for git users The case block in git.aliases.bash does the right thing for vim users that do not populate $EDITOR. However vim users that populate $EDITOR are met with the following error: $ gd Vim: Warning: Input is not from a terminal Vim: Error reading input, exiting... Vim: preserving files... Vim: Finished. Fix this inconsistency by adding another case block in the else block which handles passing the appropriate arguments to vim. Signed-off-by: Michael Turquette --- aliases/available/git.aliases.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index ab868532..803f7a17 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -47,5 +47,11 @@ if [ -z "$EDITOR" ]; then ;; esac else - alias gd="git diff | $EDITOR" + case $EDITOR in + *vim*) + alias gd="git diff | $EDITOR -R -" + ;; + *) + alias gd="git diff | $EDITOR" + esac fi