Commit 7dc46429 authored by Junio C Hamano's avatar Junio C Hamano

Fix "git checkout -b foo ':/substring'"

Because ':/substring' extended SHA1 expression cannot take
postfix modifiers such as ^{tree} and ^{commit}, we would need
to do it in multiple steps.  With the patch, you can start a new
branch from a randomly-picked commit whose message has the named
string in it.
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 0509eb21
......@@ -71,7 +71,8 @@ while test $# != 0; do
done
arg="$1"
if rev=$(git rev-parse --verify "$arg^0" 2>/dev/null)
rev=$(git rev-parse --verify "$arg" 2>/dev/null)
if rev=$(git rev-parse --verify "$rev^0" 2>/dev/null)
then
[ -z "$rev" ] && die "unknown flag $arg"
new_name="$arg"
......@@ -82,11 +83,11 @@ then
fi
new="$rev"
shift
elif rev=$(git rev-parse --verify "$arg^{tree}" 2>/dev/null)
elif rev=$(git rev-parse --verify "$rev^{tree}" 2>/dev/null)
then
# checking out selected paths from a tree-ish.
new="$rev"
new_name="$arg^{tree}"
new_name="$rev^{tree}"
shift
fi
[ "$1" = "--" ] && shift
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment