author | Petr Baudis <pasky@suse.cz> | |
Sun, 12 Feb 2006 16:06:14 +0000 (17:06 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 12 Feb 2006 21:07:02 +0000 (13:07 -0800) | ||
commit | 810255fd12536d296597a0366f514bf65c2e10f6 | |
tree | fbc9e0e9664e6f4b62c7107604b4f41a310672bb | tree | snapshot |
parent | c5e09c1fbec5dc1c15bcfe21e1a600f9e4b4e419 | commit | diff |
Properly git-bisect reset after bisecting from non-master head
git-bisect reset without an argument would return to master even
if the bisecting started at a non-master branch. This patch makes
it save the original branch name to .git/head-name and restore it
afterwards.
This is also compatible with Cogito and cg-seek, so cg-status will
show that we are seeked on the bisect branch and cg-reset will
properly restore the original branch.
git-bisect start will refuse to work if it is not on a bisect but
.git/head-name exists; this is to protect against conflicts with
other seeking tools.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-bisect reset without an argument would return to master even
if the bisecting started at a non-master branch. This patch makes
it save the original branch name to .git/head-name and restore it
afterwards.
This is also compatible with Cogito and cg-seek, so cg-status will
show that we are seeked on the bisect branch and cg-reset will
properly restore the original branch.
git-bisect start will refuse to work if it is not on a bisect but
.git/head-name exists; this is to protect against conflicts with
other seeking tools.
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-bisect.sh | diff | blob | history |