From: Yann Dirson Date: Sat, 05 May 2018 13:24:23 GMT Subject: [PATCH 2/2] Fix wrong merge-base invocation preventing detection of up-to-date branches. Message-ID: <20180505132423.18324-2-ydirson@free.fr> In-Reply-To: <20180505132423.18324-1-ydirson@free.fr> --- git-reintegrate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-reintegrate b/git-reintegrate index da45239..a6e3cff 100755 --- a/git-reintegrate +++ b/git-reintegrate @@ -581,7 +581,7 @@ def status_merge(branch_to_merge = nil) elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $status_base) state = "+" verbose_state = "merged to #{$status_base}" - elsif system(*%w[git-merge-base --is-ancestor], branch_to_merge, $branch.name) + elsif system(*%w[git merge-base --is-ancestor], branch_to_merge, $branch.name) state = "*" verbose_state = "up-to-date" else -- 2.11.0