Skip to content

Commit 7dc4642

Browse files
committed
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: Junio C Hamano <[email protected]>
1 parent 0509eb2 commit 7dc4642

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

git-checkout.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ while test $# != 0; do
7171
done
7272

7373
arg="$1"
74-
if rev=$(git rev-parse --verify "$arg^0" 2>/dev/null)
74+
rev=$(git rev-parse --verify "$arg" 2>/dev/null)
75+
if rev=$(git rev-parse --verify "$rev^0" 2>/dev/null)
7576
then
7677
[ -z "$rev" ] && die "unknown flag $arg"
7778
new_name="$arg"
@@ -82,11 +83,11 @@ then
8283
fi
8384
new="$rev"
8485
shift
85-
elif rev=$(git rev-parse --verify "$arg^{tree}" 2>/dev/null)
86+
elif rev=$(git rev-parse --verify "$rev^{tree}" 2>/dev/null)
8687
then
8788
# checking out selected paths from a tree-ish.
8889
new="$rev"
89-
new_name="$arg^{tree}"
90+
new_name="$rev^{tree}"
9091
shift
9192
fi
9293
[ "$1" = "--" ] && shift

0 commit comments

Comments
 (0)