Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  git-merge: finish when git-read-tree fails
  • Loading branch information
Junio C Hamano committed Mar 17, 2007
2 parents 4287307 + 2be08a8 commit 1589e05
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,13 @@ f,*)
# Again the most common case of merging one remote.
echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
msg="Fast forward"
if test -n "$have_message"
then
msg="$msg (no commit created; -m option ignored)"
fi
new_head=$(git-rev-parse --verify "$1^0") &&
git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
finish "$new_head" "$msg" || exit
dropsave
exit 0
Expand Down

0 comments on commit 1589e05

Please sign in to comment.