aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorEyvind Bernhardsen <eyvind-git@orakel.ntnu.no>2008-03-16 20:49:09 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-16 14:24:32 -0700
commit198724ad4ef0630892e8dbbab92e92ff4f979075 (patch)
tree312c7db7db3f1c6517ebd34d5faadfe074b27a10 /unpack-trees.c
parent20fd60bf6a0cbcd77c7b1f5b3b8bda224f896d60 (diff)
downloadgit-198724ad4ef0630892e8dbbab92e92ff4f979075.tar.gz
git-198724ad4ef0630892e8dbbab92e92ff4f979075.tar.xz
fast-import: Allow "reset" to delete a new branch without error
Creating a branch in fast-import and then resetting it without making any further commits to it currently causes an error message at the end of the import. This error is triggered by cvs2svn's git backend, which uses a temporary fixup branch when it creates tags, because the fixup branch is reset after each tag. This patch prevents the error, allowing "reset" to be used to delete temporary branches. Signed-off-by: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> Acked-by: Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions