merge: give a bit prettier merge message to "merge branch~$n"
This hacks the input to fmt-merge-msg to make the message for merging early part of a branch a little easier to read. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 16, 2006 at 12:31 UTC
b1bfcae438adb485bb66e2f59396373809e346e6
1 file changed
+17
-9
git-merge.sh
+17
-9
@@ -91,6 +91,22 @@ finish () {
91
esac
92
}
93
94
+merge_name () {
95
+ remote="$1"
96
+ rh=$(git-rev-parse --verify "$remote^0" 2>/dev/null) || return
97
+ bh=$(git-show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
98
+ if test "$rh" = "$bh"
99
+ then
100
+ echo "$rh branch '$remote' of ."
101
+ elif truname=$(expr "$remote" : '\(.*\)~[1-9][0-9]*$') &&
102
+ git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
103
+ then
104
+ echo "$rh branch '$truname' (early part) of ."
105
+ else
106
+ echo "$rh commit '$remote'"
107
+ fi
108
+}
109
+
110
case "$#" in 0) usage ;; esac
111
112
rloga= have_message=
@@ -188,15 +204,7 @@ else
204
# in this loop.
205
merge_name=$(for remote
206
do
191
- rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
192
- continue ;# not something we can merge
193
- bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null)
194
- if test "$rh" = "$bh"
195
- then
196
- echo "$rh branch '$remote' of ."
197
- else
198
- echo "$rh commit '$remote'"
199
- fi
207
+ merge_name "$remote"
208
done | git-fmt-merge-msg
209
)
210
merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"