[PATCH] git-daemon --syslog to log through syslog

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index dd36c61..e3d1196 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -24,11 +24,7 @@ then
                die "You need to first update your working tree."
 fi
 
-merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD)
-merge_name=$(
-    perl -e 'print join("; ", map { chomp; s/^[0-9a-f]*        //; $_ } <>)' \
-    "$GIT_DIR"/FETCH_HEAD
-)
+merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
 
 case "$merge_head" in
 '')
@@ -41,6 +37,5 @@ case "$merge_head" in
        ;;
 esac
 
-git-resolve \
-       "$(cat "$GIT_DIR"/HEAD)" \
-       $merge_head "Merge $merge_name"
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name"