summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-10-03 16:33:58 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 14:25:43 -0700
commitb28a88f26a21e6134a099e2d57aa088bc6d93818 (patch)
tree06ae033f69b01ad0e1ab9da714b8514b4ca34fcf /git-merge-resolve.sh
parentt5613: drop reachable_via function (diff)
downloadtgif-b28a88f26a21e6134a099e2d57aa088bc6d93818.tar.xz
t5613: drop test_valid_repo function
This function makes sure that "git fsck" does not report any errors. But "--full" has been the default since f29cd39 (fsck: default to "git fsck --full", 2009-10-20), and we can use the exit code (instead of counting the lines) since e2b4f63 (fsck: exit with non-zero status upon errors, 2007-03-05). So we can just use "git fsck", which is shorter and more flexible (e.g., we can use "git -C"). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions