Bug: write-tree corrupts intent-to-add index state
- From
Jonathon Mah <me@jonathonmah.com>
- Date
- Nov 6, 2012, 08:53 UTC
- Message-ID
- <3E62F933-76CD-4578-8684-21444EAA454F@JonathonMah.com>
Hi revisionaries,
I came across what appears to be a bug while working today. I had several changes, both staged and unstaged, and two files that I had marked with intent-to-add (git add -N).
$ git status -sb ## Library-3.x...origin/Library-3.x [ahead 4] M Library/LIRootSource.m M Library/Library.xcodeproj/project.pbxproj [...] M Library/SceneKit/LISceneKitBookshelfScene.m AM Library/SceneKit/LISceneKitDisplayedMediumProxy.h AM Library/SceneKit/LISceneKitDisplayedMediumProxy.m
(The last two files were added with -N.) I then attempted to stash my work, but that failed:
$ git stash -k error: Entry 'Library/SceneKit/LISceneKitDisplayedMediumProxy.h' not uptodate. Cannot merge. Cannot save the current worktree state
Re-checking the status showed that the intent-to-add files were now simply modified, yet they did not appear in git ls-tree -r HEAD.
$ git status -sb ## Library-3.x...origin/Library-3.x [ahead 4] M Library/LIRootSource.m M Library/Library.xcodeproj/project.pbxproj [...] M Library/SceneKit/LISceneKitBookshelfScene.m M Library/SceneKit/LISceneKitDisplayedMediumProxy.h M Library/SceneKit/LISceneKitDisplayedMediumProxy.m
It appears the index forgot that those files were new. So not only has the intent-to-add status been lost, but git status shows a file existing in neither HEAD nor the index as not-new-but-modified.
Tracing through it, I narrowed it down to git write-tree affecting the index state. As far as I can tell, it's incorrect for that command to change the index. I'm now out of my (shallow) depth in the git codebase, so I'm throwing it out there for someone to tackle (hopefully). I've attached a failing test case.
Additional notes for bug hunters:
- I've only seen files in already-existing subdirectories lose intent-to-add status, whereas marking a file in the top-level as i-t-a is preserved during write-tree.
- The 'git ls-files -s --debug' output doesn't change across the write-tree:
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 dir/baz ctime: 0:0 mtime: 0:0 dev: 0 ino: 0 uid: 0 gid: 0 size: 0 flags: 20004000
--- t/t2203-add-intent.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index ec35409..fcc67c0 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -62,5 +62,27 @@ test_expect_success 'can "commit -a" with an i-t-a entry' ' git commit -a -m all ' +test_expect_success 'i-t-a status unaffected by write-tree' ' + git reset --hard && + mkdir dir && + echo frotz >dir/bar && + git add dir && + git commit -m "establish dir" && + echo fizfaz >foo && + echo fragz >dir/baz && + git add rezrov && + git add -N foo && + git add -N dir/baz && + cat >expect <<-\EOF && + AM dir/baz + AM foo + EOF + git status --untracked-files=no --porcelain >actual && + test_cmp actual expect && + git write-tree && + git status --untracked-files=no --porcelain >actual && + test_cmp actual expect +' + test_done
-- 1.8.0 Jonathon Mah me@JonathonMah.com