diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-08 14:27:51 -0700 |
| commit | c47b89cde6e81e03a642186df90ff8b372a5bcdd (patch) | |
| tree | b3b2c2de95d4befb7c3438dc15bd9c46cc34cffb /builtin | |
| parent | b8117d2c082019928f1bccd2341dc08093496442 (diff) | |
| parent | 41c64ae0e762d2c4ef1ddd578b8992967547dc5f (diff) | |
| download | git-c47b89cde6e81e03a642186df90ff8b372a5bcdd.tar.gz | |
Merge branch 'jc/show-branch-g-current' into maint
The "--current" option of "git show-branch" should have been made
incompatible with the "--reflog" mode, but this was not enforced,
which has been corrected.
source: <xmqqh76mf7s4.fsf_-_@gitster.g>
* jc/show-branch-g-current:
show-branch: -g and --current are incompatible
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/show-branch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 330b0553b9..64c649c6a2 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -712,6 +712,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) "--all/--remotes/--independent/--merge-base"); } + if (with_current_branch && reflog) + die(_("options '%s' and '%s' cannot be used together"), + "--reflog", "--current"); + /* If nothing is specified, show all branches by default */ if (ac <= topics && all_heads + all_remotes == 0) all_heads = 1; |