Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision a153adf683d2b6e22c7e892ed8a161b140156186 authored by Petr Baudis on 24 October 2006, 00:39:14 UTC, committed by Junio C Hamano on 24 October 2006, 02:21:05 UTC 
gitweb: Fix setting $/ in parse_commit()
 
If the commit couldn't have been read, $/ wasn't restored to \n properly,
causing random havoc like git_get_ref_list() returning the ref names with
trailing \n.

Aside of potential confusion in the body of git_search(), no other $/
surprises are hopefully hidden in the code.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 83543a2
Raw File
Tip revision: a153adf683d2b6e22c7e892ed8a161b140156186 authored by Petr Baudis on 24 October 2006, 00:39:14 UTC
gitweb: Fix setting $/ in parse_commit()
Tip revision: a153adf
git-merge-ours.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top