eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 15:27:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Reintegrate: do not fail when garbage is found in the orignal

Browse Source
This commit is contained in:
Junio C Hamano 2010-05-03 13:34:23 -07:00
parent bb94632d56
commit 47dc5e28f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reintegrate
View File

@ -91,7 +91,7 @@ show_merge () {
;;
*)
echo 2>&1 "Huh?: $msg"
exit 1
return
;;
esac &&
tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&