global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-28 17:40:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "write-index: check and warn when worktree crosses a filesystem boundary"

Browse Source 
This reverts commit 52b98a7d2f.

The goal of that commit was to warn users early when their
worktree crossed filesystem boundaries. It worked by
comparing the st_dev stat information in the index, and
warning when we had more than one device.

However, the stat information may come from multiple runs,
and the st_dev field is not necessarily stable. In
particular, st_dev will change on Linux across reboots.
Index entries from the previous reboot will appear to come
from a different device, triggering a false positive.

Since this message is really only an early warning for
people who will be bit by the new
GIT_DISCOVERY_ACROSS_FILESYSTEM behavior, and because they
will get an actual error later on (when we can't find their
cross-filesystem .git directory), we can just scrap the
early warning.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2010-06-12 00:24:10 -04:00
committed by Junio C Hamano
parent 52b98a7d2f
commit 30a569d1a7
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
read-cache.c
View File

@@ -1550,8 +1550,6 @@ int write_index(struct index_state *istate, int newfd)
struct cache_entry **cache = istate->cache;
int entries = istate->cache_nr;
struct stat st;
int first_valid_ent = -1;
int more_than_one_dev;
for (i = removed = extended = 0; i < entries; i++) {
if (cache[i]->ce_flags & CE_REMOVE)
@@ -1574,7 +1572,6 @@ int write_index(struct index_state *istate, int newfd)
if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
return -1;
more_than_one_dev = 0;
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
if (ce->ce_flags & CE_REMOVE)
@@ -1583,19 +1580,8 @@ int write_index(struct index_state *istate, int newfd)
ce_smudge_racily_clean_entry(ce);
if (ce_write_entry(&c, newfd, ce) < 0)
return -1;
if (ce_uptodate(ce)) {
if (first_valid_ent < 0)
first_valid_ent = i;
else if (ce->ce_dev != cache[first_valid_ent]->ce_dev)
more_than_one_dev = 1;
}
}
if (more_than_one_dev &&
!git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0))
warning("working tree spans across filesystems but "
"GIT_DISCOVERY_ACROSS_FILESYSTEM is not set.");
/* Write extension data here */
if (istate->cache_tree) {
struct strbuf sb = STRBUF_INIT;