Reintegrate: allow regeneration of test integration on a detached HEAD

Junio C Hamano committed May 26, 2010 at 10:40 UTC 9ef638879b99950bb72e8a7372b7196f121f7695
1 file changed +2 -2
Reintegrate
+2 -2
@@ -81,11 +81,11 @@ LF='
81
82 show_merge () {
83 case "$msg" in
84 - "Merge branch '"*"'"*" into "*)
84 + "Merge branch '"*"'"*)
85 branch=$(expr "$msg" : "Merge branch '\(.*\)'")
86 merge_hier=heads/
87 ;;
88 - "Merge remote branch '"*"'"*" into "*)
88 + "Merge remote branch '"*"'"*)
89 branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
90 merge_hier=
91 ;;