[PATCH] guilt: Make sure the commit time is increasing

Git has various algorithms, most notably in git rev-list, git
name-rev, and others, which depend on the commit time increasing.  We
want to keep the commit time the same as much as possible, but if
necessary, adjust the time stamps of the patch files to obey this
constraint.

Signed-off-by: "Theodore Ts'o" <[email protected]>
Signed-off-by: Josef 'Jeff' Sipek <[email protected]>
[jeffpc: fixup test 051 to handle unchanged patch files' timestamps changing]

guilt

@@ -535,6 +535,16 @@ commit()
                         export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
 		fi
 
+		ct=`git log -1 --pretty=%ct`
+		if [ $ct -gt `stat -c %Y "$p"` ]; then
+			ct=`expr $ct + 60`
+			if [ $ct -gt `date +%s` ]; then
+				touch "$p"
+			else
+				touch -d @$ct "$p"
+			fi
+		fi
+
 		# must strip nano-second part otherwise git gets very
 		# confused, and makes up strange timestamps from the past
 		# (chances are it decides to interpret it as a unix

regression/t-051.sh

@@ -39,6 +39,10 @@ fixup_time_info second
 fixup_time_info third
 fixup_time_info fourth
 fixup_time_info fifth
+fixup_time_info modify
+fixup_time_info add
+fixup_time_info remove
+fixup_time_info mode
 
 p=first