undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t0006: test timezone parsing
  rerere.txt: Document forget subcommand
  Documentation/git-gc.txt: add reference to githooks
This commit is contained in:
Junio C Hamano 2010-07-05 11:56:53 -07:00
commit ad9d8e8f0f
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-gc.txt
View File

@ -137,6 +137,13 @@ If you are expecting some objects to be collected and they aren't, check
all of those locations and decide whether it makes sense in your case to all of those locations and decide whether it makes sense in your case to
remove those references. remove those references.
HOOKS
-----
The 'git gc --auto' command will run the 'pre-auto-gc' hook. See
linkgit:githooks[5] for more information.
SEE ALSO SEE ALSO
-------- --------
linkgit:git-prune[1] linkgit:git-prune[1]

7
Documentation/git-rerere.txt
View File

@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS SYNOPSIS
-------- --------
'git rerere' ['clear'|'diff'|'status'|'gc'] 'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
DESCRIPTION DESCRIPTION
----------- -----------
@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
will automatically invoke this command. will automatically invoke this command.
'forget' <pathspec>::
This resets the conflict resolutions which rerere has recorded for the current
conflict in <pathspec>. The <pathspec> is optional.
'diff':: 'diff'::
This displays diffs for the current state of the resolution. It is This displays diffs for the current state of the resolution. It is

5
t/t0006-date.sh
View File

@ -28,8 +28,8 @@ check_show 31449600 '12 months ago'
check_parse() { check_parse() {
echo "$1 -> $2" >expect echo "$1 -> $2" >expect
test_expect_${3:-success} "parse date ($1)" " test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "
test-date parse '$1' >actual && TZ=${3:-$TZ} test-date parse '$1' >actual &&
test_cmp expect actual test_cmp expect actual
" "
} }
@ -38,6 +38,7 @@ check_parse 2008 bad
check_parse 2008-02 bad check_parse 2008-02 bad
check_parse 2008-02-14 bad check_parse 2008-02-14 bad
check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000'
check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
check_approxidate() { check_approxidate() {
echo "$1 -> $2 +0000" >expect echo "$1 -> $2 +0000" >expect

9
test-date.c
View File

@ -21,12 +21,15 @@ static void parse_dates(char **argv, struct timeval *now)
for (; *argv; argv++) { for (; *argv; argv++) {
char result[100]; char result[100];
time_t t; time_t t;
int tz;
result[0] = 0; result[0] = 0;
parse_date(*argv, result, sizeof(result)); parse_date(*argv, result, sizeof(result));
t = strtoul(result, NULL, 0); if (sscanf(result, "%ld %d", &t, &tz) == 2)
printf("%s -> %s\n", *argv, printf("%s -> %s\n",
t ? show_date(t, 0, DATE_ISO8601) : "bad"); *argv, show_date(t, tz, DATE_ISO8601));
else
printf("%s -> bad\n", *argv);
} }
} }