Merge pull request #1605 from weaveworks/issue/1533-move-tag-when-cha…

…nged

Move sync tag only when changed

daemon/daemon_test.go

@@ -290,7 +290,7 @@ func TestDaemon_ListImagesWithOptions(t *testing.T) {
 		{
 			name: "Override container field selection",
 			opts: v10.ListImagesOptions{
-				Spec: specAll,
+				Spec:                    specAll,
 				OverrideContainerFields: []string{"Name", "Current", "NewAvailableImagesCount"},
 			},
 			expectedImages: []v6.ImageStatus{
@@ -320,7 +320,7 @@ func TestDaemon_ListImagesWithOptions(t *testing.T) {
 		{
 			name: "Override container field selection with invalid field",
 			opts: v10.ListImagesOptions{
-				Spec: specAll,
+				Spec:                    specAll,
 				OverrideContainerFields: []string{"InvalidField"},
 			},
 			expectedImages: nil,

daemon/loop.go

@@ -321,7 +321,7 @@ func (d *Daemon) doSync(logger log.Logger) (retErr error) {
 							Error:    n.Result.Error(),
 						},
 						Spec: event.ReleaseSpec{
-							Type: event.ReleaseContainersSpecType,
+							Type:                  event.ReleaseContainersSpecType,
 							ReleaseContainersSpec: &spec,
 						},
 						Cause: n.Spec.Cause,
@@ -411,23 +411,23 @@ func (d *Daemon) doSync(logger log.Logger) (retErr error) {
 	}
 
 	// Move the tag and push it so we know how far we've gotten.
-	{
-		ctx, cancel := context.WithTimeout(ctx, gitOpTimeout)
-		err := working.MoveSyncTagAndPush(ctx, newTagRev, "Sync pointer")
-		cancel()
-		if err != nil {
-			return err
-		}
-	}
-
 	if oldTagRev != newTagRev {
+		{
+			ctx, cancel := context.WithTimeout(ctx, gitOpTimeout)
+			err := working.MoveSyncTagAndPush(ctx, newTagRev, "Sync pointer")
+			cancel()
+			if err != nil {
+				return err
+			}
+		}
 		logger.Log("tag", d.GitConfig.SyncTag, "old", oldTagRev, "new", newTagRev)
-		ctx, cancel := context.WithTimeout(ctx, gitOpTimeout)
-		err := d.Repo.Refresh(ctx)
-		cancel()
-		return err
+		{
+			ctx, cancel := context.WithTimeout(ctx, gitOpTimeout)
+			err := d.Repo.Refresh(ctx)
+			cancel()
+			return err
+		}
 	}
-
 	return nil
 }