distinguish file & docker timestamps

Author: mzihlmann

cmd/diffoci/commands/diff/diff.go

@@ -43,6 +43,7 @@ func NewCommand() *cobra.Command {
 					"ignore-history",
 					"ignore-file-order",
 					"ignore-file-mode-redundant-bits",
+					"ignore-file-timestamps",
 					"ignore-image-name",
 					"ignore-tar-format",
 					"treat-canonical-paths-equal",
@@ -67,6 +68,7 @@ func NewCommand() *cobra.Command {
 	flags.Bool("ignore-history", false, "Ignore history")
 	flags.Bool("ignore-file-order", false, "Ignore file order in tar layers")
 	flags.Bool("ignore-file-mode-redundant-bits", false, "Ignore redundant bits of file mode")
+	flags.Bool("ignore-file-timestamps", false, "Ignore timestamps on files")
 	flags.Bool("ignore-image-name", false, "Ignore image name annotation")
 	flags.Bool("ignore-tar-format", false, "Ignore tar format")
 	flags.Bool("treat-canonical-paths-equal", false, "Treat leading `./` `/` `` in file paths as canonical")
@@ -111,6 +113,10 @@ func action(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	options.IgnoreFileTimestamps, err = flags.GetBool("ignore-file-timestamps")
+	if err != nil {
+		return err
+	}
 	options.IgnoreImageName, err = flags.GetBool("ignore-image-name")
 	if err != nil {
 		return err

pkg/diff/diff.go

@@ -36,6 +36,7 @@ type IgnoranceOptions struct {
 	IgnoreHistory               bool
 	IgnoreFileOrder             bool
 	IgnoreFileModeRedundantBits bool
+	IgnoreFileTimestamps        bool
 	IgnoreImageName             bool
 	IgnoreTarFormat             bool
 	CanonicalPaths              bool
@@ -865,7 +866,7 @@ func (d *differ) diffTarEntries(ctx context.Context, node *EventTreeNode, in [2]
 
 func (d *differ) diffTarEntry(ctx context.Context, node *EventTreeNode, in [2]EventInput) (dirsToBeRemovedIfEmpty []string, retErr error) {
 	var negligibleTarFields []string
-	if d.o.IgnoreTimestamps {
+	if d.o.IgnoreFileTimestamps {
 		negligibleTarFields = append(negligibleTarFields, "ModTime", "AccessTime", "ChangeTime", "PAXRecords")
 	}
 	cmpOpts := []cmp.Option{cmpopts.IgnoreUnexported(TarEntry{}), cmpopts.IgnoreFields(tar.Header{}, negligibleTarFields...)}