druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zsh:alias:git-base-branch: Match merge commits too

Browse Source 
Merge commits should also be matched (indicated by a '-') for the case
that the base branches last commit is a merge commit and another branch
exists that checked out the newest commit that was merged.

Example log (from `glog`):
```
* abcdef Foo (HEAD -> feature)
*   bcdefa Merge branch 'other-feature' into base (base)
|\
| * cdefab Bar (other-feature)
|/
* ...
...
```

with `git show-branch -a` output like:
```
! [base] Merge branch 'other-feature' into base
 * [feature] Foo
  ! [other-feature] Bar
---
 *  [feature] Foo
--  [base] Merge branch 'other-feature' into base
+*+ [other-feature] Bar
```

Here we want `base` to be returned instead of `other-feature` and thus
'-' needs to be matched as well.
This commit is contained in:
druckdev
2021-05-15 23:17:36 +02:00
parent ed215a35f7
commit c1955dd5f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/zsh/zshrc.d/30-alias.zsh
View File

@@ -34,7 +34,7 @@
alias gss='git stash' alias gss='git stash'
# https://nilansanjaya.wordpress.com/2017/06/02/git-find-base-branch/ # https://nilansanjaya.wordpress.com/2017/06/02/git-find-base-branch/
git_bb='git show-branch -a 2>/dev/null' git_bb='git show-branch -a 2>/dev/null'
git_bb+=' | grep "^[^[]*\*"' git_bb+=' | grep "^[^[]*[*-].*\["'
git_bb+=' | grep -v "^[^[]*\[$(git rev-parse --abbrev-ref HEAD)\]"' git_bb+=' | grep -v "^[^[]*\[$(git rev-parse --abbrev-ref HEAD)\]"'
git_bb+=' | head -n1' git_bb+=' | head -n1'
git_bb+=' | sed -E "s/^[^[]*\[([^]~^]*).*$/\1/"' git_bb+=' | sed -E "s/^[^[]*\[([^]~^]*).*$/\1/"'