global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 10:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  git-merge: do not leak rev-parse output used for checking internally.
  git-merge: tighten error checking.
This commit is contained in:
Junio C Hamano
2006-11-26 22:52:08 -08:00
parent 0e829e1ee6 3c23bea8ac
commit b3fccc6347
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-merge.sh
View File

@@ -159,7 +159,7 @@ then
shift
head_arg="$1"
shift
elif ! git-rev-parse --verify HEAD 2>/dev/null
elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
then
# If the merged head is a valid one there is no reason to
# forbid "git merge" into a branch yet to be born. We do
@@ -188,13 +188,13 @@ else
# in this loop.
merge_name=$(for remote
do
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null)
rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) &&
if git show-ref -q --verify "refs/heads/$remote"
then
what=branch
else
what=commit
fi
fi &&
echo "$rh $what '$remote'"
done | git-fmt-merge-msg
)
@@ -209,7 +209,7 @@ test "$rloga" = '' && rloga="merge: $@"
remoteheads=
for remote
do
remotehead=$(git-rev-parse --verify "$remote"^0) ||
remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
die "$remote - not something we can merge"
remoteheads="${remoteheads}$remotehead "
done