commands/command_migrate.go: use formatRefName to qualify references

Per our work in the previous commit(s), it is now suitable to call
formatRefName() again thus avoiding our "hack" to prepend the remote
name to the reference before calling '(*git.Ref) Refspec()'.

As such, let's do that.

Co-authored-by: brian m. carlson <bk2204@github.com>
This commit is contained in:
Taylor Blau 2018-09-25 14:36:14 -07:00
parent 3421b7292e
commit 45846c2f05

@ -221,9 +221,10 @@ func includeExcludeRefs(l *tasklog.Logger, args []string) (include, exclude []st
return nil, nil, err
}
for _, refs := range remoteRefs {
for remote, refs := range remoteRefs {
for _, ref := range refs {
exclude = append(exclude, ref.Refspec())
exclude = append(exclude,
formatRefName(ref, remote))
}
}
}
@ -263,13 +264,6 @@ func getRemoteRefs(l *tasklog.Logger) (map[string][]*git.Ref, error) {
return nil, err
}
for i, rr := range refsForRemote {
// HACK(@ttaylorr): add remote name to fully-qualify
// references:
refsForRemote[i].Name =
fmt.Sprintf("%s/%s", remote, rr.Name)
}
refs[remote] = refsForRemote
}