chore: set save to true for loadUsingRegistry and dedupe checks

Author: ischolten

Diff for: pkg/buildx/commands/bake.go

@@ -108,7 +108,7 @@ func RunBake(dockerCli command.Cli, in BakeOptions, validator BakeValidator, pri
 			},
 		)
 	}
-	if in.save || in.loadUsingRegistry {
+	if in.save {
 		opts := registry.SaveOptions{
 			ProjectID:             in.project,
 			BuildID:               in.buildID,
@@ -327,14 +327,15 @@ func BakeCmd() *cobra.Command {
 				}
 				loadUsingRegistry := build.LoadUsingRegistry()
 				if options.exportLoad && loadUsingRegistry {
+					options.save = true
 					pullInfo, err := depotbuild.PullBuildInfo(context.Background(), build.ID, token)
 					// if we cannot get pull info, dont fail; load as normal
 					if err == nil {
 						options.loadUsingRegistry = loadUsingRegistry
 						options.pullInfo = pullInfo
 					}
 				}
-				if options.save || options.loadUsingRegistry {
+				if options.save {
 					options.additionalCredentials = build.AdditionalCredentials()
 					options.additionalTags = build.AdditionalTags()
 				}

Diff for: pkg/buildx/commands/build.go

@@ -239,7 +239,7 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.No
 			},
 		)
 	}
-	if depotOpts.save || depotOpts.loadUsingRegistry {
+	if depotOpts.save {
 		saveOpts := registry.SaveOptions{
 			ProjectID:             depotOpts.project,
 			BuildID:               depotOpts.buildID,
@@ -692,14 +692,15 @@ func BuildCmd() *cobra.Command {
 			}
 			loadUsingRegistry := build.LoadUsingRegistry()
 			if options.exportLoad && loadUsingRegistry {
+				options.save = true
 				pullInfo, err := depotbuild.PullBuildInfo(context.Background(), build.ID, token)
 				// if we cannot get pull info, dont fail; load as normal
 				if err == nil {
 					options.loadUsingRegistry = loadUsingRegistry
 					options.pullInfo = pullInfo
 				}
 			}
-			if options.save || options.loadUsingRegistry {
+			if options.save {
 				options.additionalCredentials = build.AdditionalCredentials()
 				options.additionalTags = build.AdditionalTags()
 			}