diff options
| author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-08-13 17:17:22 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2013-08-13 21:28:50 +0200 |
| commit | 338a732009d64d70ce5362fda3851208a9a65daf (patch) | |
| tree | 77a6b56f8938782c0246204a0d5252831eb5fea3 | |
| parent | 9054978fe04c3046d494ffbe21065a102228fd1b (diff) | |
[Git] bisect fuck.
| -rw-r--r-- | 01_Internal.zsh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/01_Internal.zsh b/01_Internal.zsh index 259bde0..c0604af 100644 --- a/01_Internal.zsh +++ b/01_Internal.zsh @@ -296,12 +296,14 @@ __get_git_branch () onto=$(cat $REBASE_DIR/onto | cut -c-7) # amended commit - amend=$(cat $REBASE_DIR/stopped-sha) - if [ "$amend" != "$(echo $commit_ish | cut -c-7)" ] + [ -e $REBASE_DIR/original-commit ] && amend=$(cat $REBASE_DIR/original-commit | cut -c-7) + [ -e $REBASE_DIR/stopped-sha ] && amend=$(cat $REBASE_DIR/stopped-sha) + # + if [ "$amend" != "$commit_ish" ] then #amend=$(git name-rev --name-only "$amend" 2>/dev/null | __cleanup_git_branch_name) #[ "$amend" = "undefined" ] && - amend=$(cat $REBASE_DIR/stopped-sha) + amend=$(echo $amend | cut -c-7) amend=" ◃ "$C_$color[magenta]$_C$amend$C_$_prompt_colors[soft_generic]$_C else amend="" |