blob: 26b724c8c6d9f273f112e10d1c7c58024403fea4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
#!/bin/sh
# Copyright (c) 2008, Nanako Shiraishi
# Prime rerere database from existing merge commits
me=rerere-train
USAGE=$(cat <<-EOF
usage: $me [--overwrite] <rev-list-args>
-h, --help show the help
-o, --overwrite overwrite any existing rerere cache
EOF
)
SUBDIRECTORY_OK=Yes
overwrite=0
while test $# -gt 0
do
opt="$1"
case "$opt" in
-h|--help)
echo "$USAGE"
exit 0
;;
-o|--overwrite)
overwrite=1
shift
break
;;
--)
shift
break
;;
*)
break
;;
esac
done
# Overwrite or help options are not valid except as first arg
for opt in "$@"
do
case "$opt" in
-h|--help)
echo "$USAGE"
exit 0
;;
-o|--overwrite)
echo "$USAGE"
exit 0
;;
esac
done
. "$(git --exec-path)/git-sh-setup"
require_work_tree
cd_to_toplevel
# Remember original branch
branch=$(git symbolic-ref -q HEAD) ||
original_HEAD=$(git rev-parse --verify HEAD) || {
echo >&2 "Not on any branch and no commit yet?"
exit 1
}
mkdir -p "$GIT_DIR/rr-cache" || exit
git rev-list --parents "$@" |
while read commit parent1 other_parents
do
if test -z "$other_parents"
then
# Skip non-merges
continue
fi
git checkout -q "$parent1^0"
if git merge $other_parents >/dev/null 2>&1
then
# Cleanly merges
continue
fi
if test $overwrite = 1
then
git rerere forget .
fi
if test -s "$GIT_DIR/MERGE_RR"
then
git --no-pager show -s --format="Learning from %h %s" "$commit"
git rerere
git checkout -q $commit -- .
git rerere
fi
git reset -q --hard # Might nuke untracked files...
done
if test -z "$branch"
then
git checkout "$original_HEAD"
else
git checkout "${branch#refs/heads/}"
fi
|
