[PATCH] Use standard -t option for touch.

[PATCH] Use standard -t option for touch.

[Simon 'corecode' Schubert]

Non-GNU touch do not have the -d option to take free form
date strings.  The POSIX -t option should be more widespread.
For this to work, date needs to output YYYYMMDDHHMM.SS date strings.

Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
---
 t/t4200-rerere.sh |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 5ee5b23..91be272 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -120,29 +120,29 @@ case "$(date -d @11111111 +%s 2>/dev/null)" in
 	just_over_15_days_ago=$(($now-1-15*86400))
 	almost_60_days_ago=$(($now+60-60*86400))
 	just_over_60_days_ago=$(($now-1-60*86400))
-	predate1="$(date -d "@$almost_60_days_ago" +%c)"
-	predate2="$(date -d "@$almost_15_days_ago" +%c)"
-	postdate1="$(date -d "@$just_over_60_days_ago" +%c)"
-	postdate2="$(date -d "@$just_over_15_days_ago" +%c)"
+	predate1="$(date -d "@$almost_60_days_ago" +%Y%m%d%H%M.%S)"
+	predate2="$(date -d "@$almost_15_days_ago" +%Y%m%d%H%M.%S)"
+	postdate1="$(date -d "@$just_over_60_days_ago" +%Y%m%d%H%M.%S)"
+	postdate2="$(date -d "@$just_over_15_days_ago" +%Y%m%d%H%M.%S)"
 	;;
 *)
 	# it is not GNU date. oh, well.
-	predate1="$(date)"
-	predate2="$(date)"
-	postdate1='1 Oct 2006 00:00:00'
-	postdate2='1 Dec 2006 00:00:00'
+	predate1="$(date +%Y%m%d%H%M.%S)"
+	predate2="$(date +%Y%m%d%H%M.%S)"
+	postdate1='200610010000.00'
+	postdate2='200612010000.00'
 esac
 
-touch -m -d "$predate1" $rr/preimage
-touch -m -d "$predate2" $rr2/preimage
+touch -m -t "$predate1" $rr/preimage
+touch -m -t "$predate2" $rr2/preimage
 
 test_expect_success 'garbage collection (part1)' 'git rerere gc'
 
 test_expect_success 'young records still live' \
 	"test -f $rr/preimage -a -f $rr2/preimage"
 
-touch -m -d "$postdate1" $rr/preimage
-touch -m -d "$postdate2" $rr2/preimage
+touch -m -t "$postdate1" $rr/preimage
+touch -m -t "$postdate2" $rr2/preimage
 
 test_expect_success 'garbage collection (part2)' 'git rerere gc'
 
-- 
1.5.0.rc1.g8bef

Re: [PATCH] Use standard -t option for touch.

[Johannes Schindelin]

Hi,

Simon, please don't use "undisclosed recipients". After all, this is 
_open_ source, and you make it really inconvenient to reply.

On Thu, 18 Jan 2007, Simon 'corecode' Schubert wrote:

> Non-GNU touch do not have the -d option to take free form
> date strings.  The POSIX -t option should be more widespread.
> For this to work, date needs to output YYYYMMDDHHMM.SS date strings.

I just checked on an SGI machine, and it has "-t". In related news, it 
also has /usr/bin/printf.

Ciao,
Dscho

Re: [PATCH] Use standard -t option for touch.

[Simon 'corecode' Schubert]

[-- Attachment #1: Type: text/plain, Size: 937 bytes --]

Johannes Schindelin wrote:
> Simon, please don't use "undisclosed recipients". After all, this is 
> _open_ source, and you make it really inconvenient to reply.

oh, sorry.  i just feed git-format-patch into sendmail. i'll need to teach git-send-email to accept - for stdin.

>> Non-GNU touch do not have the -d option to take free form
>> date strings.  The POSIX -t option should be more widespread.
>> For this to work, date needs to output YYYYMMDDHHMM.SS date strings.
> I just checked on an SGI machine, and it has "-t". In related news, it 
> also has /usr/bin/printf.

thanks for checking!

cheers
  simon

-- 
Serve - BSD     +++  RENT this banner advert  +++    ASCII Ribbon   /"\
Work - Mac      +++  space for low €€€ NOW!1  +++      Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Re: [PATCH] Use standard -t option for touch.

[Junio C Hamano]

Hhmmmmm.

This still does not seem to fix the breakage I am seeing on
OpenBSD.

But thanks anyway for trying.