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>

Eyvind Bernhardsen committed Mar 16, 2008 at 20:49 UTC 198724ad4ef0630892e8dbbab92e92ff4f979075

1 file changed +2

fast-import.c

@@ -1516,6 +1516,8 @@ static int update_branch(struct branch *b)

1516 struct ref_lock *lock;

1517 unsigned char old_sha1[20];

1518

1519 + if (is_null_sha1(b->sha1))

1520 + return 0;

1521 if (read_ref(b->name, old_sha1))

1522 hashclr(old_sha1);

1523 lock = lock_any_ref_for_update(b->name, old_sha1, 0);