diff options
| author |  Aaron Lipman <alipman88@gmail.com> | 2020-08-30 18:42:00 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-08 15:44:25 -0700 |
| commit | e6d5a11fed0bd6871a16e9004d960f1447529e67 (patch) | |
| tree | 2de55343ab2d37d3684da39675fc198813a6ddce /xdiff/xutils.c | |
| parent | Git 2.28 (diff) | |
| download | tgif-e6d5a11fed0bd6871a16e9004d960f1447529e67.tar.xz | |
t3200: clean side effect of git checkout --orphan
The "refuse --edit-description on unborn branch for now" test in t3200
switches to an orphan branch, causing subsequent git commands
referencing HEAD to fail. Avoid this side-effect by switching back to
master after the test finishes.
This has gone undetected, as the next affected test expects failure -
but it currently fails for the wrong reason.
Verbose output of the next test referencing HEAD,
"--merged is incompatible with --no-merged":
fatal: malformed object name HEAD
Which this commit corrects to:
error: option `no-merged' is incompatible with --merged
Signed-off-by: Aaron Lipman <alipman88@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xutils.c')
0 files changed, 0 insertions, 0 deletions