Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Mark http-fetch without -a as deprecated
[gitweb.git]
/
builtin
/
reset.c
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 98bca044c1267fa63cb084a45aaf621e85f7d9b6..777e7c612900f867c5a52723ebdd56c9db793489 100644
(file)
--- a/
builtin/reset.c
+++ b/
builtin/reset.c
@@
-162,7
+162,7
@@
static void update_index_from_diff(struct diff_queue_struct *q,
for (i = 0; i < q->nr; i++) {
struct diff_filespec *one = q->queue[i]->one;
- if (one->mode) {
+ if (one->mode
&& !is_null_sha1(one->sha1)
) {
struct cache_entry *ce;
ce = make_cache_entry(one->mode, one->sha1, one->path,
0, 0);