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
|
#!/bin/sh
#
# Copyright (c) Josef "Jeff" Sipek, 2007
#
USAGE="[<hash> | <since>..[<until>] | ..<until>]"
. `dirname $0`/guilt
if [ $# -ne 1 ] || [ -z "$1" ]; then
die "You must specify a range of commits"
fi
rhash=`munge_hash_range $1`
# make sure that there are no unapplied changes
if ! must_commit_first; then
die "Uncommited changes detected. Refresh first."
fi
disp "About to begin conversion..." >&2
disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2
for rev in `git rev-list $rhash`; do
s=`git log --pretty=oneline -1 $rev | cut -c 42-`
fname=`echo $s | sed -e "s/&/and/g" -e "s/[ :]/_/g" -e "s,[/\\],-,g" \
-e "s/['\\[{}]//g" -e 's/]//g' -e 's/\*/-/g' \
-e 's/\?/-/g' | tr A-Z a-z`
disp "Converting `echo $rev | cut -c 1-8` as $fname"
mangle_prefix=1
fname_base=$fname
while [ -f "$GUILT_DIR/$branch/$fname" ]; do
fname="$fname_base-$mangle_prefix"
mangle_prefix=`expr $mangle_prefix + 1`
disp "Patch under that name exists...trying '$fname'"
done
(
do_make_header $rev
echo ""
git diff $rev^..$rev
) > $GUILT_DIR/$branch/$fname
# FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the
# timestamp on the patch
# insert the patch name into the series file
series_insert_patch $fname
# Only reset if the commit was on this branch
if head_check $rev 2> /dev/null; then
# BEWARE: "git reset" ahead! Is there a way to verify that
# we really created a patch? - We don't want to lose any
# history.
git reset --hard $rev^ > /dev/null
elif [ -z "$warned" ]; then
disp "Warning: commit $rev is not the HEAD...preserving commit" >&2
disp "Warning: (this message is displayed only once)" >&2
warned=t
fi
done
disp "Done." >&2
disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2
|
