2009-03-20 06:00:43 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Test reflog display routines'
|
2020-11-18 23:44:21 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2022-04-13 20:01:52 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2009-03-20 06:00:43 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
echo content >file &&
|
|
|
|
git add file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m one
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
commit=$(git rev-parse --short HEAD)
|
2009-03-20 06:00:43 +00:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
|
|
Reflog message: commit (initial): one
|
|
|
|
EOF
|
|
|
|
test_expect_success 'log -g shows reflog headers' '
|
|
|
|
git log -g -1 >tmp &&
|
|
|
|
grep ^Reflog <tmp >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
$commit HEAD@{0}: commit (initial): one
|
2009-03-20 06:00:43 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'oneline reflog format' '
|
|
|
|
git log -g -1 --oneline >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-04-01 09:20:32 +00:00
|
|
|
test_expect_success 'reflog default format' '
|
|
|
|
git reflog -1 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
commit $commit
|
2011-04-01 09:20:32 +00:00
|
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
|
|
Reflog message: commit (initial): one
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
|
|
|
|
one
|
|
|
|
EOF
|
2011-04-01 09:20:33 +00:00
|
|
|
test_expect_success 'override reflog default format' '
|
2011-04-01 09:20:32 +00:00
|
|
|
git reflog --format=short -1 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-03-20 06:00:43 +00:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter <committer@example.com>)
|
|
|
|
Reflog message: commit (initial): one
|
|
|
|
EOF
|
|
|
|
test_expect_success 'using @{now} syntax shows reflog date (multiline)' '
|
|
|
|
git log -g -1 HEAD@{now} >tmp &&
|
|
|
|
grep ^Reflog <tmp >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
$commit HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
|
2009-03-20 06:00:43 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'using @{now} syntax shows reflog date (oneline)' '
|
|
|
|
git log -g -1 --oneline HEAD@{now} >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-05-04 05:23:14 +00:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
HEAD@{Thu Apr 7 15:13:13 2005 -0700}
|
|
|
|
EOF
|
|
|
|
test_expect_success 'using @{now} syntax shows reflog date (format=%gd)' '
|
|
|
|
git log -g -1 --format=%gd HEAD@{now} >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-03-20 06:00:43 +00:00
|
|
|
cat >expect <<'EOF'
|
2012-05-07 21:11:32 +00:00
|
|
|
Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter <committer@example.com>)
|
2009-03-20 06:00:43 +00:00
|
|
|
Reflog message: commit (initial): one
|
|
|
|
EOF
|
|
|
|
test_expect_success 'using --date= shows reflog date (multiline)' '
|
2012-05-07 21:11:32 +00:00
|
|
|
git log -g -1 --date=default >tmp &&
|
2009-03-20 06:00:43 +00:00
|
|
|
grep ^Reflog <tmp >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
$commit HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
|
2009-03-20 06:00:43 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'using --date= shows reflog date (oneline)' '
|
2012-05-07 21:11:32 +00:00
|
|
|
git log -g -1 --oneline --date=default >actual &&
|
2009-03-20 06:00:43 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-05-04 05:23:14 +00:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
HEAD@{1112911993 -0700}
|
|
|
|
EOF
|
|
|
|
test_expect_success 'using --date= shows reflog date (format=%gd)' '
|
|
|
|
git log -g -1 --format=%gd --date=raw >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<'EOF'
|
|
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
|
|
Reflog message: commit (initial): one
|
|
|
|
EOF
|
|
|
|
test_expect_success 'log.date does not invoke "--date" magic (multiline)' '
|
|
|
|
test_config log.date raw &&
|
|
|
|
git log -g -1 >tmp &&
|
|
|
|
grep ^Reflog <tmp >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-03-25 19:20:50 +00:00
|
|
|
cat >expect <<EOF
|
|
|
|
$commit HEAD@{0}: commit (initial): one
|
2012-05-04 05:23:14 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'log.date does not invoke "--date" magic (oneline)' '
|
|
|
|
test_config log.date raw &&
|
|
|
|
git log -g -1 --oneline >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<'EOF'
|
|
|
|
HEAD@{0}
|
|
|
|
EOF
|
log: respect date_mode_explicit with --format:%gd
When we show a reflog selector (e.g., via "git log -g"), we
perform some DWIM magic: while we normally show the entry's
index (e.g., HEAD@{1}), if the user has given us a date
with "--date", then we show a date-based select (e.g.,
HEAD@{yesterday}).
However, we don't want to trigger this magic if the
alternate date format we got was from the "log.date"
configuration; that is not sufficiently strong context for
us to invoke this particular magic. To fix this, commit
f4ea32f (improve reflog date/number heuristic, 2009-09-24)
introduced a "date_mode_explicit" flag in rev_info. This
flag is set only when we see a "--date" option on the
command line, and we a vanilla date to the reflog code if
the date was not explicit.
Later, commit 8f8f547 (Introduce new pretty formats %g[sdD]
for reflog information, 2009-10-19) added another way to
show selectors, and it did not respect the date_mode_explicit
flag from f4ea32f.
This patch propagates the date_mode_explicit flag to the
pretty-print code, which can then use it to pass the
appropriate date field to the reflog code. This brings the
behavior of "%gd" in line with the other formats, and means
that its output is independent of any user configuration.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-04 05:25:18 +00:00
|
|
|
test_expect_success 'log.date does not invoke "--date" magic (format=%gd)' '
|
2012-05-04 05:23:14 +00:00
|
|
|
test_config log.date raw &&
|
|
|
|
git log -g -1 --format=%gd >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
reflog-walk: always make HEAD@{0} show indexed selectors
When we are showing reflog selectors during a walk, we infer
from context whether the user wanted to see the index in
each selector, or the reflog date. The current rules are:
1. if the user asked for an explicit date format in the
output, show the date
2. if the user asked for ref@{now}, show the date
3. if neither is true, show the index
However, if we see "ref@{0}", that should be a strong clue
that the user wants to see the counted version. In fact, it
should be much stronger than the date format in (1). The
user may have been setting the date format to use in another
part of the output (e.g., in --format="%gd (%ad)", they may
have wanted to influence the author date).
This patch flips the rules to:
1. if the user asked for ref@{0}, always show the index
2. if the user asked for ref@{now}, always show the date
3. otherwise, we have just "ref"; show them counted by
default, but respect the presence of "--date" as a clue
that the user wanted them date-based
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-05-04 05:27:25 +00:00
|
|
|
cat >expect <<'EOF'
|
|
|
|
HEAD@{0}
|
|
|
|
EOF
|
|
|
|
test_expect_success '--date magic does not override explicit @{0} syntax' '
|
|
|
|
git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2010-03-13 22:47:05 +00:00
|
|
|
test_expect_success 'empty reflog file' '
|
|
|
|
git branch empty &&
|
2015-07-27 22:57:08 +00:00
|
|
|
git reflog expire --expire=all refs/heads/empty &&
|
2010-03-13 22:47:05 +00:00
|
|
|
|
|
|
|
git log -g empty >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2010-03-13 22:47:05 +00:00
|
|
|
'
|
|
|
|
|
2013-08-03 10:36:15 +00:00
|
|
|
# This guards against the alternative of showing the diffs vs. the
|
|
|
|
# reflog ancestor. The reflog used is designed to list the commits
|
|
|
|
# more than once, so as to exercise the corresponding logic.
|
|
|
|
test_expect_success 'git log -g -p shows diffs vs. parents' '
|
|
|
|
test_commit two &&
|
|
|
|
git branch flipflop &&
|
|
|
|
git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
|
|
|
|
git update-ref refs/heads/flipflop -m flop1 HEAD &&
|
|
|
|
git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
|
|
|
|
git log -g -p flipflop >reflog &&
|
|
|
|
grep -v ^Reflog reflog >actual &&
|
|
|
|
git log -1 -p HEAD^ >log.one &&
|
|
|
|
git log -1 -p HEAD >log.two &&
|
|
|
|
(
|
2018-07-02 00:23:56 +00:00
|
|
|
cat log.one && echo &&
|
|
|
|
cat log.two && echo &&
|
|
|
|
cat log.one && echo &&
|
2013-08-03 10:36:15 +00:00
|
|
|
cat log.two
|
|
|
|
) >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-03-20 06:00:43 +00:00
|
|
|
test_done
|