diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:56:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 12:56:01 -0800 |
| commit | bb86a40e06ce1caafd74cc9fc87db4d5da8e3d07 (patch) | |
| tree | 30ca25a9391bafdd9041e6ba9e6a7448b0838123 /t | |
| parent | 098501527f2b5628f086d3d9d2fda87220c069a5 (diff) | |
| parent | fa137f67a40bbcb3f583920586fdd34ce98ddeaf (diff) | |
| download | git-bb86a40e06ce1caafd74cc9fc87db4d5da8e3d07.tar.gz | |
Merge branch 'nd/lockfile-absolute'
The lockfile API can get confused which file to clean up when the
process moved the $cwd after creating a lockfile.
* nd/lockfile-absolute:
lockfile.c: store absolute path
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 1bafb9098c..dfe02f4818 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -65,4 +65,19 @@ test_expect_success '--cacheinfo mode,sha1,path (new syntax)' ' test_cmp expect actual ' +test_expect_success '.lock files cleaned up' ' + mkdir cleanup && + ( + cd cleanup && + mkdir worktree && + git init repo && + cd repo && + git config core.worktree ../../worktree && + # --refresh triggers late setup_work_tree, + # active_cache_changed is zero, rollback_lock_file fails + git update-index --refresh && + ! test -f .git/index.lock + ) +' + test_done |