summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Antonio Russo <aerusso@aerusso.net>2021-01-03 19:30:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-04 12:20:49 -0800
commitc8302c6c0027fb8714106b9365f3443a2d233f44 (patch)
tree6f364b5d3e3ec3839220d86b250e24c0b521df76 /Documentation/git-merge.txt
parentGit 2.30 (diff)
downloadtgif-c8302c6c0027fb8714106b9365f3443a2d233f44.tar.xz
t6016: move to lib-log-graph.sh framework
t6016 manually reconstructs git log --graph output by using the reported commit hashes from `git rev-parse`. Each tag is converted into an environment variable manually, and then `echo`-ed to an expected output file, which is in turn compared to the actual output. The expected output is difficult to read and write, because, e.g., each line of output must be prefaced with echo, quoted, and properly escaped. Additionally, the test is sensitive to trailing whitespace, which may potentially be removed from graph log output in the future. In order to reduce duplication, ease troubleshooting of failed tests by improving readability, and ease the addition of more tests to this file, port the operations to `lib-log-graph.sh`, which is already used in several other tests, e.g., t4215. Give all merges a simple commit message, and use a common `check_graph` macro taking a heredoc of the expected output which does not required extensive escaping. Signed-off-by: Antonio Russo <aerusso@aerusso.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions