Commit 3ba2e865 authored by Johannes Sixt's avatar Johannes Sixt Committed by Junio C Hamano

stash: copy the index using --index-output instead of cp -p

'git stash create' must operate with a temporary index. For this purpose,
it used 'cp -p' to create a copy. -p is needed to preserve the timestamp
of the index file. Now Jakob Pfender reported a certain combination of
a Linux NFS client, OpenBSD NFS server, and cp implementation where this
operation failed.

Luckily, the first operation in git-stash after copying the index is to
call 'git read-tree'. Therefore, use --index-output instead of 'cp -p'
to write the copy of the index.

--index-output requires that the specified file is on the same volume as
the source index, so that the lock file can be rename()d. For this reason,
the name of the temporary index is constructed in a way different from the
other temporary files. The code path of 'stash -p' also needs a temporary
index, but we do not use the new name because it does not depend on the
same precondition as --index-output.
Signed-off-by: default avatarJohannes Sixt <j6t@kdbg.org>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 23a32ffe
...@@ -17,7 +17,8 @@ require_work_tree ...@@ -17,7 +17,8 @@ require_work_tree
cd_to_toplevel cd_to_toplevel
TMP="$GIT_DIR/.git-stash.$$" TMP="$GIT_DIR/.git-stash.$$"
trap 'rm -f "$TMP-"*' 0 TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$
trap 'rm -f "$TMP-"* "$TMPindex"' 0
ref_stash=refs/stash ref_stash=refs/stash
...@@ -81,14 +82,12 @@ create_stash () { ...@@ -81,14 +82,12 @@ create_stash () {
# state of the working tree # state of the working tree
w_tree=$( ( w_tree=$( (
rm -f "$TMP-index" && git read-tree --index-output="$TMPindex" -m $i_tree &&
cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" && GIT_INDEX_FILE="$TMPindex" &&
GIT_INDEX_FILE="$TMP-index" &&
export GIT_INDEX_FILE && export GIT_INDEX_FILE &&
git read-tree -m $i_tree &&
git diff --name-only -z HEAD | git update-index -z --add --remove --stdin && git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
git write-tree && git write-tree &&
rm -f "$TMP-index" rm -f "$TMPindex"
) ) || ) ) ||
die "Cannot save the current worktree state" die "Cannot save the current worktree state"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment