Revert "fix: dont throw away changes"
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This reverts commit dd0f328a65
.
Part of coop-cloud/organising#282.
This commit is contained in:
parent
48e16c414c
commit
d087a60e09
|
@ -525,7 +525,7 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
|
||||||
|
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
checkOutOpts := &git.CheckoutOptions{
|
||||||
Create: false,
|
Create: false,
|
||||||
Keep: true,
|
Force: true,
|
||||||
Branch: plumbing.ReferenceName(ref.Name()),
|
Branch: plumbing.ReferenceName(ref.Name()),
|
||||||
}
|
}
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
if err := worktree.Checkout(checkOutOpts); err != nil {
|
||||||
|
@ -603,7 +603,7 @@ func GetRecipeVersions(recipeName string) (RecipeVersions, error) {
|
||||||
refName := fmt.Sprintf("refs/heads/%s", branch)
|
refName := fmt.Sprintf("refs/heads/%s", branch)
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
checkOutOpts := &git.CheckoutOptions{
|
||||||
Create: false,
|
Create: false,
|
||||||
Keep: true,
|
Force: true,
|
||||||
Branch: plumbing.ReferenceName(refName),
|
Branch: plumbing.ReferenceName(refName),
|
||||||
}
|
}
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
if err := worktree.Checkout(checkOutOpts); err != nil {
|
||||||
|
|
|
@ -76,7 +76,7 @@ func EnsureUpToDate(dir string) error {
|
||||||
refName := fmt.Sprintf("refs/heads/%s", branch)
|
refName := fmt.Sprintf("refs/heads/%s", branch)
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
checkOutOpts := &git.CheckoutOptions{
|
||||||
Create: false,
|
Create: false,
|
||||||
Keep: true,
|
Force: true,
|
||||||
Branch: plumbing.ReferenceName(refName),
|
Branch: plumbing.ReferenceName(refName),
|
||||||
}
|
}
|
||||||
if err := worktree.Checkout(checkOutOpts); err != nil {
|
if err := worktree.Checkout(checkOutOpts); err != nil {
|
||||||
|
|
|
@ -169,7 +169,7 @@ func EnsureVersion(recipeName, version string) error {
|
||||||
opts := &git.CheckoutOptions{
|
opts := &git.CheckoutOptions{
|
||||||
Branch: tagRef,
|
Branch: tagRef,
|
||||||
Create: false,
|
Create: false,
|
||||||
Keep: true,
|
Force: true,
|
||||||
}
|
}
|
||||||
if err := worktree.Checkout(opts); err != nil {
|
if err := worktree.Checkout(opts); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -221,7 +221,7 @@ func EnsureLatest(recipeName string) error {
|
||||||
refName := fmt.Sprintf("refs/heads/%s", branch)
|
refName := fmt.Sprintf("refs/heads/%s", branch)
|
||||||
checkOutOpts := &git.CheckoutOptions{
|
checkOutOpts := &git.CheckoutOptions{
|
||||||
Create: false,
|
Create: false,
|
||||||
Keep: true,
|
Force: true,
|
||||||
Branch: plumbing.ReferenceName(refName),
|
Branch: plumbing.ReferenceName(refName),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue