diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-08 16:32:35 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-08 16:32:35 +0000 |
| commit | 0354e368456cd42e0e55bde02037f28866108fd0 (patch) | |
| tree | 380876c8f717f2eefd38159ac0f8557e1721947a /usr.bin | |
| parent | 83992e7971282d6bfbfa7c538b0e344287c5733c (diff) | |
Don't check a file for conflict markers if it has no CVS/Entries entry.
ok joris
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 7b80811e47c..dc9a7a965c4 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.146 2008/05/30 16:14:34 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.147 2008/06/08 16:32:34 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -525,7 +525,7 @@ update_has_conflict_markers(struct cvs_file *cf) cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path); - if (cf->fd == -1) + if (cf->fd == -1 || cf->file_ent == NULL) return (0); bp = cvs_buf_load_fd(cf->fd); |