summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-08-24 13:34:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-24 23:58:44 -0700
commit95728f74b100a4feabb5c70c0e6d8bed9dc29451 (patch)
tree24f7307bbc4f570c6443f98f2b00d6841b580a50 /git-merge-octopus.sh
parentt/t7106-reset-unborn-branch.sh: Add PERL prerequisite (diff)
downloadtgif-95728f74b100a4feabb5c70c0e6d8bed9dc29451.tar.xz
reset test: modernize style
Avoid command substitution and pipes to ensure that the exit status from each git command is tested (and in particular that any segfaults are caught). Maintain the test setup (no commits, one file named "a", another named "b") even after the last test, to make it easier to rearrange tests or add new tests after the last in the future. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions