Merge pull request #743 from profclems/fix-merge-detached-branch

fix `mr merge` failing on detached branch
profclems · May 27, 2021 · be2dec0 · be2dec0
2 parents cd37ff9 + 2900bc4
commit be2dec0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/commands/mr/mrutils/mrutils.go b/commands/mr/mrutils/mrutils.go
@@ -139,10 +139,7 @@ func MRFromArgsWithOpts(
 		return nil, nil, err
 	}
 
-	branch, err := f.Branch()
-	if err != nil {
-		return nil, nil, err
-	}
+	var branch string
 
 	if len(args) > 0 {
 		mrID, err = strconv.Atoi(args[0])
@@ -153,6 +150,13 @@ func MRFromArgsWithOpts(
 		}
 	}
 
+	if branch == "" {
+		branch, err = f.Branch()
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
 	if mrID == 0 {
 		mr, err = getMRForBranch(apiClient, baseRepo, branch, state)
 		if err != nil {