mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'maint'
* maint: t0006: test timezone parsing rerere.txt: Document forget subcommand Documentation/git-gc.txt: add reference to githooks
This commit is contained in:
commit
ad9d8e8f0f
|
@ -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
|
||||
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
|
||||
--------
|
||||
linkgit:git-prune[1]
|
||||
|
|
|
@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git rerere' ['clear'|'diff'|'status'|'gc']
|
||||
'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
|
||||
|
||||
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]'
|
||||
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'::
|
||||
|
||||
This displays diffs for the current state of the resolution. It is
|
||||
|
|
|
@ -28,8 +28,8 @@ check_show 31449600 '12 months ago'
|
|||
|
||||
check_parse() {
|
||||
echo "$1 -> $2" >expect
|
||||
test_expect_${3:-success} "parse date ($1)" "
|
||||
test-date parse '$1' >actual &&
|
||||
test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "
|
||||
TZ=${3:-$TZ} test-date parse '$1' >actual &&
|
||||
test_cmp expect actual
|
||||
"
|
||||
}
|
||||
|
@ -38,6 +38,7 @@ check_parse 2008 bad
|
|||
check_parse 2008-02 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 -0500' '2008-02-14 20:30:45 -0500'
|
||||
|
||||
check_approxidate() {
|
||||
echo "$1 -> $2 +0000" >expect
|
||||
|
|
|
@ -21,12 +21,15 @@ static void parse_dates(char **argv, struct timeval *now)
|
|||
for (; *argv; argv++) {
|
||||
char result[100];
|
||||
time_t t;
|
||||
int tz;
|
||||
|
||||
result[0] = 0;
|
||||
parse_date(*argv, result, sizeof(result));
|
||||
t = strtoul(result, NULL, 0);
|
||||
printf("%s -> %s\n", *argv,
|
||||
t ? show_date(t, 0, DATE_ISO8601) : "bad");
|
||||
if (sscanf(result, "%ld %d", &t, &tz) == 2)
|
||||
printf("%s -> %s\n",
|
||||
*argv, show_date(t, tz, DATE_ISO8601));
|
||||
else
|
||||
printf("%s -> bad\n", *argv);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue