summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2010-06-21 12:37:14 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 11:11:48 -0700
commit6a1b3fc78311f16834d885e4e0baead8e51ed631 (patch)
tree858aad4246ee8dc9acc7ccd1ad707b5f38ac57f2 /git-merge-octopus.sh
parentt/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression (diff)
downloadtgif-6a1b3fc78311f16834d885e4e0baead8e51ed631.tar.xz
t/t7811-grep-open.sh: ensure fake "less" is made executable
The fake "less" script was not being made executable. This can cause the tests that follow to fail. This failure is not apparent on platforms which have DEFAULT_PAGER set to the string "less", since lib-pager.sh will have set the $less variable to "less" and the SIMPLEPAGER prerequisite will have been set, and so the "less" script will have already been created properly and made executable in test 2 'git grep -O'. On platforms which set DEFAULT_PAGER to something like "more", no such script will have been previously created, and tests 7 and 8 will fail. So, add a call to chmod to make the fake "less" script executable. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions