diff options
| author | Hugues Hiegel <hugues.hiegel@openwide.fr> | 2009-07-09 11:14:16 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@openwide.fr> | 2009-07-09 11:14:16 +0200 |
| commit | ea88a545c99d45d467748b86d89c57cb6e44baf5 (patch) | |
| tree | d3faf9ed1ecc4af743ca3d22bee5e4894988889b /01_Functions.zsh | |
| parent | e6e9d2323bf476b4d3f05db5f4c87597e07315d9 (diff) | |
[Funcs] test if git-rebase is in rebase-merge
Diffstat (limited to '01_Functions.zsh')
| -rw-r--r-- | 01_Functions.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/01_Functions.zsh b/01_Functions.zsh index 87bc5b4..6871852 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -129,7 +129,7 @@ get_git_branch () REBASE_DIR=$GIT_DIR/rebase-apply fi - if [ -d $GIT_DIR/rebase-merge ] + if [ "$REBASE_DIR" = "$GIT_DIR/rebase-merge" ] then current=$(< $REBASE_DIR/done wc -l) last=$(( $current + $(< $REBASE_DIR/git-rebase-todo grep -v "^#\|^[[:blank:]]*$" | wc -l) )) |