Don't require that a branch is checked out to rebase

Author: guywithnose

README.md

@@ -2,7 +2,7 @@ pull-request-parser uses the Github API to parse open pull requests and aggregat
 
 ### Setup
 ```sh
-go get github.com/guywithnose/pull-request-parser/prp
+go get github.com/guywithnose/pull-request-parser/cmd/prp
 prp --config ~/prpConfig.json init-config
 prp --config ~/prpConfig.json profile add default --token {YOUR_GITHUB_TOKEN}
 prp --config ~/prpConfig.json repo add {USER} {REPO_NAME}

prp/main.go renamed to cmd/prp/main.go

@@ -396,6 +396,46 @@ func TestCmdAutoRebase(t *testing.T) {
 				runner.NewExpectedCommand(repoDir, "git fetch upstream", "", 0),
 				runner.NewExpectedCommand(repoDir, "git stash", "", 0),
 				runner.NewExpectedCommand(repoDir, "git symbolic-ref HEAD", "Not a branch", 128),
+				runner.NewExpectedCommand(repoDir, "git rev-parse HEAD", "abcdefg", 0),
+				runner.NewExpectedCommand(repoDir, "git checkout -b prp-ref1", "", 0),
+				runner.NewExpectedCommand(repoDir, "git reset --hard origin/ref1", "", 0),
+				runner.NewExpectedCommand(repoDir, "git rebase upstream/baseRef1", "", 0),
+				runner.NewExpectedCommand(repoDir, "git push origin prp-ref1:ref1 --force", "", 0),
+				runner.NewExpectedCommand(repoDir, "git checkout abcdefg", "", 0),
+				runner.NewExpectedCommand(repoDir, "git branch -D prp-ref1", "", 0),
+				runner.NewExpectedCommand(repoDir, "git stash pop", "", 0),
+			},
+			[]string{
+				"Requesting repo data from config",
+				"Analyzing remotes",
+				"Checking for local changes",
+				"Fetching from remote: origin",
+				"Fetching from remote: upstream",
+				"Local changes found... stashing",
+				"Saving current branch name",
+				"Current branch name is abcdefg",
+				"Checking out temporary branch: prp-ref1",
+				"Resetting code to origin/ref1",
+				"Rebasing against upstream/baseRef1",
+				"Pushing to origin/ref1",
+				"Going back to branch abcdefg",
+				"Deleting temporary branch prp-ref1",
+				"Popping the stash",
+				"",
+			},
+			true,
+			false,
+		},
+		{
+			"NoValidHead",
+			[]*runner.ExpectedCommand{
+				runner.NewExpectedCommand(repoDir, "git remote -v", "origin\tlabelSSHURL (push)\nupstream\tbaseLabel1SSHURL (fetch)", 0),
+				runner.NewExpectedCommand(repoDir, "git diff-index --quiet HEAD", "", 1),
+				runner.NewExpectedCommand(repoDir, "git fetch origin", "", 0),
+				runner.NewExpectedCommand(repoDir, "git fetch upstream", "", 0),
+				runner.NewExpectedCommand(repoDir, "git stash", "", 0),
+				runner.NewExpectedCommand(repoDir, "git symbolic-ref HEAD", "Not a branch", 128),
+				runner.NewExpectedCommand(repoDir, "git rev-parse HEAD", "Not a branch", 128),
 				runner.NewExpectedCommand(repoDir, "git stash pop", "", 0),
 			},
 			[]string{

command/autoRebase_test.go

@@ -207,7 +207,13 @@ func (r rebaser) getCurrentBranch(path string) (string, error) {
 	if err != nil {
 		code := getErrorCode(err)
 		if code == 128 {
-			return "", fmt.Errorf("No branch checked out in %s\n%s", path, string(currentBranchOutput))
+			getCurrentBranch = r.cmdWrapper.New(path, "git", "rev-parse", "HEAD")
+			currentBranchOutput, err = getCurrentBranch.CombinedOutput()
+			if err != nil {
+				return "", fmt.Errorf("No branch checked out in %s\n%s", path, string(currentBranchOutput))
+			}
+
+			return strings.Replace(strings.Replace(string(currentBranchOutput), "refs/heads/", "", -1), "\n", "", -1), nil
 		}
 
 		return "", fmt.Errorf("%s\n%s", err, string(currentBranchOutput))