commit dc8256b60dd076b61c44c4cf547127149bb6b15c from: Christian Weisgerber date: Tue Aug 31 19:18:37 2021 UTC "got blame" now shows UTC dates, adapt regression test; ok stsp commit - c2d7bc3f2831dfbe9406b0858dbae9384247467d commit + dc8256b60dd076b61c44c4cf547127149bb6b15c blob - 7fe69498eee43992d8562292d0f697608c58fe0c blob + a9916124c369cb2ba1bac4634cd2e80573716a5a --- regress/cmdline/blame.sh +++ regress/cmdline/blame.sh @@ -65,7 +65,7 @@ test_blame_basic() { local short_commit2=`trim_obj_id 32 $commit2` local short_commit3=`trim_obj_id 32 $commit3` - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected @@ -113,7 +113,7 @@ test_blame_tag() { local short_commit1=`trim_obj_id 32 $commit1` local short_commit2=`trim_obj_id 32 $commit2` - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected @@ -149,7 +149,7 @@ test_blame_file_single_line() { local short_commit1=`trim_obj_id 32 $commit1` - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -184,7 +184,7 @@ test_blame_file_single_line_no_newline() { local short_commit1=`trim_obj_id 32 $commit1` - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -213,7 +213,7 @@ test_blame_all_lines_replaced() { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit1 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected @@ -265,7 +265,7 @@ test_blame_lines_shifted_up() { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 foo" >> $testroot/stdout.expected @@ -321,7 +321,7 @@ test_blame_lines_shifted_down() { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "01) $short_commit1 $d $GOT_AUTHOR_8 1" \ > $testroot/stdout.expected echo "02) $short_commit1 $d $GOT_AUTHOR_8 2" \ @@ -394,7 +394,7 @@ EOF local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time1=`git_show_author_time $testroot/repo` - local d1=`date -r $author_time1 +"%G-%m-%d"` + local d1=`date -u -r $author_time1 +"%G-%m-%d"` cat > $testroot/wt/alpha < $testroot/wt/alpha < $testroot/wt/alpha < $testroot/stdout) @@ -718,7 +718,7 @@ test_blame_added_on_branch() { local short_commit2=`trim_obj_id 32 $commit2` local short_commit3=`trim_obj_id 32 $commit3` - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected @@ -788,7 +788,7 @@ test_blame_symlink() { return 1 fi - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit0 $d $GOT_AUTHOR_8 alpha" \ > $testroot/stdout.expected @@ -809,7 +809,7 @@ test_blame_symlink() { return 1 fi - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit0 $d $GOT_AUTHOR_8 beta" \ > $testroot/stdout.expected @@ -958,7 +958,7 @@ EOF (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G-%m-%d"` + d=`date -u -r $author_time +"%G-%m-%d"` echo "1) $short_commit5 $d $GOT_AUTHOR_8 X" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 A" >> $testroot/stdout.expected echo "3) $short_commit1 $d $GOT_AUTHOR_8 B" >> $testroot/stdout.expected