summaryrefslogtreecommitdiff
path: root/name-rev.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-28 21:00:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-28 21:00:31 (GMT)
commit7f4bd5d831ea838668d1de5f5af022f763230eee (patch)
treefe3405797846971d38fb3d9fb4637199743a88f6 /name-rev.c
parent36d277c72d90d32f99616072b64a2652248f5264 (diff)
downloadgit-7f4bd5d831ea838668d1de5f5af022f763230eee.zip
git-7f4bd5d831ea838668d1de5f5af022f763230eee.tar.gz
git-7f4bd5d831ea838668d1de5f5af022f763230eee.tar.bz2
rebase: one safety net, one bugfix and one optimization.
When a .dotest from a previously failed rebase or patch application exists, rebase got confused and tried to apply mixture of what was already there and what is being rebased. Check the existence of the directory and barf. It failed with an mysterious "fatal: cannot read mbox" message if the branch being rebased is fully in sync with the base. Also if the branch is a proper descendant of the base, there is no need to run rebase logic. Prevent these from happening by checking where the merge-base is. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'name-rev.c')
0 files changed, 0 insertions, 0 deletions