Skip to main content

Browse the archive

Staging
v0.5.1
Revision ee831f7ddfc40e9144208c93e24d20ff0ad69194 authored by Gerrit Pape on 05 May 2008, 07:43:00 UTC, committed by Junio C Hamano on 06 May 2008, 00:18:20 UTC 
git-bisect.sh: don't accidentally override existing branch "bisect"
 
If a branch named "bisect" or "new-bisect" already was created in the
repo by other means than git bisect, doing a git bisect used to override
the branch without a warning.  Now if the branch "bisect" or
"new-bisect" already exists, and it was not created by git bisect itself,
git bisect start fails with an appropriate error message.  Additionally,
if checking out a new bisect state fails due to a merge problem, git
bisect cleans up the temporary branch "new-bisect".

The accidental override has been noticed by Andres Salomon, reported
through
 http://bugs.debian.org/478647

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6233a52
Raw File
fixup-builtins 
#!/bin/sh
while [ "$1" ]
do
	old="$1"
	new=$(echo "$1" | sed 's/git-/git /')
	echo "Converting '$old' to '$new'"
	git ls-files '*.sh' | while read file
	do
		sed "s/\\<$old\\>/$new/g" < $file > $file.new
		chmod --reference=$file $file.new
		mv $file.new $file
	done
	shift
done
git update-index --refresh >& /dev/null
exit 0
back to top