diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
| commit | 7aa50897dda0360b9cbbe23e723a5aee461e1d71 (patch) | |
| tree | faa92da7147f6ffee7057a9e3afeaa2a6fca398c /builtin | |
| parent | b5e104a0e69f224b89a849fa1e9b4064a36c2f4b (diff) | |
| parent | ff00b682f203eb39876b57404916b4c54b6032c6 (diff) | |
| download | git-7aa50897dda0360b9cbbe23e723a5aee461e1d71.tar.gz | |
Merge branch 'jc/maint-reset-unmerged-path' into maint
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 98bca044c1..777e7c6129 100644 --- 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); |