diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-01-27 00:07:49 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-01-27 10:22:37 -0800 |
| commit | 8fe533f686e20852fa9bd2df2755faed7c7bcdcc (patch) | |
| tree | 7178c7f14de671bd9cdc8ee626962f96b74f5026 /diff-delta.c | |
| parent | Teach fast-import to import subtrees named by tree id (diff) | |
| download | tgif-8fe533f686e20852fa9bd2df2755faed7c7bcdcc.tar.xz | |
fast-import: treat filemodify with empty tree as delete
Normal git processes do not allow one to build a tree with an empty
subtree entry without trying hard at it. This is in keeping with the
general UI philosophy: git tracks content, not empty directories.
v1.7.3-rc0~75^2 (2010-06-30) changed that by making it easy to include
an empty subtree in fast-import's active commit:
M 040000 4b825dc642cb6eb9a060e54bf8d69288fbee4904 subdir
One can trigger this by reading an empty tree (for example, the tree
corresponding to an empty root commit) and trying to move it to a
subtree. It is better and more closely analogous to 'git read-tree
--prefix' to treat such commands as requests to remove the subtree.
Noticed-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions