diff options
Diffstat (limited to 'git-codereview/change.go')
| -rw-r--r-- | git-codereview/change.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-codereview/change.go b/git-codereview/change.go index 5320d9d..24cbb71 100644 --- a/git-codereview/change.go +++ b/git-codereview/change.go @@ -26,6 +26,13 @@ func cmdChange(args []string) { exit(2) } + if _, err := cmdOutputErr("git", "rev-parse", "--abbrev-ref", "MERGE_HEAD"); err == nil { + diePendingMerge("change") + } + if _, err := cmdOutputErr("git", "rev-parse", "--abbrev-ref", "REBASE_HEAD"); err == nil { + dief("cannot change: found pending rebase or sync") + } + // Checkout or create branch, if specified. target := flags.Arg(0) if target != "" { |