From: Johannes Sixt <j.sixt@viscovery.net>
To: Jakob Pfender <jpfender@elegosoft.com>
Cc: git@vger.kernel.org, casey@nrlssc.navy.mil,
jon.seymour@gmail.com, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] stash: copy the index using --index-output instead of cp -p
Date: Tue, 15 Mar 2011 13:37:52 +0100 [thread overview]
Message-ID: <4D7F5DA0.3030608@viscovery.net> (raw)
In-Reply-To: <4D7F54C2.5060500@elegosoft.com>
From: Johannes Sixt <j6t@kdbg.org>
'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.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Tested-by: Jakob Pfender <jpfender@elegosoft.com>
---
Here's a wrap-up. Acked-by is reserved for people whose area-of-expertise
is touched by someone else. Tested-by is more appropriate here.
git-stash.sh | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 7561b37..fa62135 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -82,10 +82,9 @@ create_stash () {
# state of the working tree
w_tree=$( (
rm -f "$TMP-index" &&
- cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
+ git read-tree --index-output="$TMP-index" -m $i_tree &&
GIT_INDEX_FILE="$TMP-index" &&
export GIT_INDEX_FILE &&
- git read-tree -m $i_tree &&
git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
git write-tree &&
rm -f "$TMP-index"
--
1.7.4.rc3.76.gfb457d
next prev parent reply other threads:[~2011-03-15 12:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 10:08 [RFD] git stash over OpenBSD/Linux NFS - cp -p breakage Jakob Pfender
2011-03-15 10:58 ` Johannes Sixt
2011-03-15 12:00 ` Jakob Pfender
2011-03-15 12:37 ` Johannes Sixt [this message]
2011-03-15 19:28 ` [PATCH] stash: copy the index using --index-output instead of cp -p Junio C Hamano
2011-03-15 19:53 ` Bert Wesarg
2011-03-16 8:12 ` Johannes Sixt
2011-03-16 8:14 ` [PATCH 1/2] stash: fix incorrect quoting in cleanup of temporary files Johannes Sixt
2011-03-16 8:18 ` [PATCH 2/2 v2] stash: copy the index using --index-output instead of cp -p Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D7F5DA0.3030608@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=casey@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jon.seymour@gmail.com \
--cc=jpfender@elegosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.