← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to git-merge-stupid.sh

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
http://bugs.debian.org/445188
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
git-merge-stupid.sh
24
24
        esac
25
25
done
26
26
 
27
 
# Give up if we are given more than two remotes -- not handling octopus.
 
27
# Give up if we are given two or more remotes -- not handling octopus.
28
28
case "$remotes" in
29
29
?*' '?*)
30
30
        exit 2 ;;
40
40
        for c in $bases
41
41
        do
42
42
                rm -f $G
43
 
                GIT_INDEX_FILE=$G git-read-tree -m $c $head $remotes \
 
43
                GIT_INDEX_FILE=$G git read-tree -m $c $head $remotes \
44
44
                         2>/dev/null || continue
45
45
                # Count the paths that are unmerged.
46
 
                cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l`
 
46
                cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l`
47
47
                if test $best_cnt -le 0 -o $cnt -le $best_cnt
48
48
                then
49
49
                        best=$c
63
63
        ;;
64
64
esac
65
65
 
66
 
git-update-index --refresh 2>/dev/null
67
 
git-read-tree -u -m $common $head $remotes || exit 2
 
66
git update-index --refresh 2>/dev/null
 
67
git read-tree -u -m $common $head $remotes || exit 2
68
68
echo "Trying simple merge."
69
 
if result_tree=$(git-write-tree  2>/dev/null)
 
69
if result_tree=$(git write-tree  2>/dev/null)
70
70
then
71
71
        exit 0
72
72
else