aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-20 19:57:00 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-20 19:57:00 -0700
commit7df6ddf51ea71d81874ecfa34f670f50a3d45103 (patch)
tree479b8f75453017af3076f9e246facdb5f9b7917b /unpack-trees.c
parentaba170cdb4874b72dd619e6f7bbc13c33295f831 (diff)
parent5b6dedd6a0b7566f7e8466b6aefe8f019c52f5d3 (diff)
downloadgit-7df6ddf51ea71d81874ecfa34f670f50a3d45103.tar.gz
git-7df6ddf51ea71d81874ecfa34f670f50a3d45103.tar.xz
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: annotate: make it work from subdirectories. git-config: Correct asciidoc documentation for --int/--bool t1300: Add tests for git-config --bool --get unpack-trees.c: verify_uptodate: remove dead code Use PATH_MAX instead of TEMPFILE_PATH_LEN branch: fix segfault when resolving an invalid HEAD
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 906ce69ea..cac2411b9 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -414,10 +414,6 @@ static void verify_uptodate(struct cache_entry *ce,
return;
errno = 0;
}
- if (o->reset) {
- ce->ce_flags |= htons(CE_UPDATE);
- return;
- }
if (errno == ENOENT)
return;
die("Entry '%s' not uptodate. Cannot merge.", ce->name);