summaryrefslogtreecommitdiff
path: root/builtin-reset.c
diff options
context:
space:
mode:
authorDmitry Potapov <dpotapov@gmail.com>2008-10-05 06:14:40 +0400
committerShawn O. Pearce <spearce@spearce.org>2008-10-06 00:49:57 -0700
commitd09e2cd5516473753cb067e723293fab180e0b1b (patch)
treeebf5708b1076468cefe37763f41660cd1ce5256e /builtin-reset.c
parent62525ef78e8aec776f44da525030d76b52f14a57 (diff)
downloadgit-d09e2cd5516473753cb067e723293fab180e0b1b.tar.gz
do not segfault if make_cache_entry failed
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-reset.c')
-rw-r--r--builtin-reset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-reset.c b/builtin-reset.c
index c24c219091..16e6bb20f1 100644
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -121,6 +121,9 @@ static void update_index_from_diff(struct diff_queue_struct *q,
struct cache_entry *ce;
ce = make_cache_entry(one->mode, one->sha1, one->path,
0, 0);
+ if (!ce)
+ die("make_cache_entry failed for path '%s'",
+ one->path);
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD |
ADD_CACHE_OK_TO_REPLACE);
} else