diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 01:19:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 01:19:30 -0700 |
| commit | 58f6fb53dd1104559f6f5507562a975c0ff079af (patch) | |
| tree | e5d6efb5312abab35abf8a7b18aacc61776c6592 /builtin-add.c | |
| parent | cbb390cd8f58ca6fc5c7b2c710425649b057b6d6 (diff) | |
| parent | 09d5dc32fbdfa7bfd23fe377455445dd2605c3b9 (diff) | |
| download | git-58f6fb53dd1104559f6f5507562a975c0ff079af.tar.gz | |
Merge branch 'jc/cachetree' into cr/reset
* jc/cachetree:
Simplify cache API
git-format-patch --in-reply-to: accept <message@id> with angle brackets
git-add -u: do not barf on type changes
Remove duplicate note about removing commits with git-filter-branch
git-clone: improve error message if curl program is missing or not executable
git.el: Allow the add and remove commands to be applied to ignored files.
git.el: Allow selecting whether to display uptodate/unknown/ignored files.
git.el: Keep the status buffer sorted by filename.
hooks--update: Explicitly check for all zeros for a deleted ref.
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c index 105a9f0e1f..866d19dd77 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -98,11 +98,11 @@ static void update_callback(struct diff_queue_struct *q, die("unexpacted diff status %c", p->status); case DIFF_STATUS_UNMERGED: case DIFF_STATUS_MODIFIED: + case DIFF_STATUS_TYPE_CHANGED: add_file_to_cache(path, verbose); break; case DIFF_STATUS_DELETED: remove_file_from_cache(path); - cache_tree_invalidate_path(active_cache_tree, path); if (verbose) printf("remove '%s'\n", path); break; |