![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Simon Hausmann <simon@lst.de> | |
| Mon, 3 Mar 2008 10:55:48 +0000 (11:55 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Mar 2008 05:53:51 +0000 (21:53 -0800) | ||
| commit | 30b5940bcd3ed7392795f6a27563013f6f806de4 | |
| tree | 28a33c4d455cfa595ed320c019275e26a5058044 | tree | snapshot |
| parent | a798b2c0f60ed7ae9161a4c4affb6127ff3b2575 | commit | diff |
git-p4: Fix import of changesets with file deletions
Commit 3a70cdfa42199e16d2d047c286431c4274d65b1a made readP4Files abort quickly
when the changeset only contains files that are marked for deletion with an empty return
value, which caused the commit to not do anything.
This commit changes readP4Files to distinguish between files that need to be passed to p4
print and files that have no content ("deleted") and merge them in the returned
list.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commit 3a70cdfa42199e16d2d047c286431c4274d65b1a made readP4Files abort quickly
when the changeset only contains files that are marked for deletion with an empty return
value, which caused the commit to not do anything.
This commit changes readP4Files to distinguish between files that need to be passed to p4
print and files that have no content ("deleted") and merge them in the returned
list.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/fast-import/git-p4 | diff | blob | history |