aboutsummaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-29 14:48:22 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-29 14:48:22 -0700
commitcc7d5bcf006e92d554cae0aefc9d8681d4659dce (patch)
treeb01489c36672856c17fa7a0b4687871e8f960111 /git-merge-octopus.sh
parent75dedd5a21246be03ae443e9fc6a9f75c6d2995b (diff)
downloadgit-cc7d5bcf006e92d554cae0aefc9d8681d4659dce.tar.gz
git-cc7d5bcf006e92d554cae0aefc9d8681d4659dce.tar.xz
Racy GIT (part #3)
Commit 29e4d3635709778bcc808dbad0477efad82f8d7e fixed the underlying update-index races but git-commit was not careful enough to preserve the index file timestamp when copying the index file. This caused t3402 test to occasionally fail. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions