summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jeff Hostetler <jeffhost@microsoft.com>2021-02-03 15:34:40 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-16 17:14:34 -0800
commiteb10e637cf04a19b9a3d5d7c904d71bc9e4ea408 (patch)
treea4a881474665b96228cca2229dc7f5bab7b70459 /git-merge-octopus.sh
parentGit 2.30 (diff)
downloadtgif-eb10e637cf04a19b9a3d5d7c904d71bc9e4ea408.tar.xz
p7519: do not rely on "xargs -d" in test
Convert the test to use a more portable method to update the mtime on a large number of files under version control. The Mac version of xargs does not support the "-d" option. Likewise, the "-0" and "--null" options are not portable. Furthermore, use `test-tool chmtime` rather than `touch` to update the mtime to ensure that it is actually updated (especially on file systems with only whole second resolution). Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions