git-am: -i does not take a string parameter.
[git/git.git] / git-quiltimport.sh
CommitLineData
d3d8f361 1#!/bin/sh
e01fbf1a
PH
2OPTIONS_KEEPDASHDASH=
3OPTIONS_SPEC="\
4git-quiltimport [options]
5--
6n,dry-run dry run
7author= author name and email address for patches without any
8patches= path to the quilt series and patches
9"
d3d8f361
EB
10SUBDIRECTORY_ON=Yes
11. git-sh-setup
12
d3bd4ee1 13dry_run=""
d3d8f361 14quilt_author=""
822f7c73 15while test $# != 0
d3d8f361
EB
16do
17 case "$1" in
e01fbf1a 18 --author)
d3d8f361
EB
19 shift
20 quilt_author="$1"
d3d8f361 21 ;;
e01fbf1a 22 -n|--dry-run)
d3bd4ee1
EB
23 dry_run=1
24 ;;
e01fbf1a 25 --patches)
d3d8f361
EB
26 QUILT_PATCHES="$1"
27 shift
28 ;;
e01fbf1a
PH
29 --)
30 shift
31 break;;
d3d8f361 32 *)
e01fbf1a 33 usage
d3d8f361
EB
34 ;;
35 esac
e01fbf1a 36 shift
d3d8f361
EB
37done
38
39# Quilt Author
40if [ -n "$quilt_author" ] ; then
41 quilt_author_name=$(expr "z$quilt_author" : 'z\(.*[^ ]\) *<.*') &&
42 quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
43 test '' != "$quilt_author_name" &&
44 test '' != "$quilt_author_email" ||
82e5a82f 45 die "malformed --author parameter"
d3d8f361
EB
46fi
47
48# Quilt patch directory
49: ${QUILT_PATCHES:=patches}
50if ! [ -d "$QUILT_PATCHES" ] ; then
51 echo "The \"$QUILT_PATCHES\" directory does not exist."
52 exit 1
53fi
54
3dff5379 55# Temporary directories
d3d8f361
EB
56tmp_dir=.dotest
57tmp_msg="$tmp_dir/msg"
58tmp_patch="$tmp_dir/patch"
59tmp_info="$tmp_dir/info"
60
61
62# Find the intial commit
5be60078 63commit=$(git rev-parse HEAD)
d3d8f361
EB
64
65mkdir $tmp_dir || exit 2
9d6f220c 66for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
9f569fe5
DN
67 if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
68 echo "$patch_name doesn't exist. Skipping."
69 continue
70 fi
d3d8f361 71 echo $patch_name
9d6f220c
JT
72 git mailinfo "$tmp_msg" "$tmp_patch" \
73 <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
74 test -s "$tmp_patch" || {
7d4f4a2f 75 echo "Patch is empty. Was it split wrong?"
1fa9bf36 76 exit 1
87ab7992 77 }
d3d8f361
EB
78
79 # Parse the author information
80 export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
81 export GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
82 while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do
83 if [ -n "$quilt_author" ] ; then
84 GIT_AUTHOR_NAME="$quilt_author_name";
85 GIT_AUTHOR_EMAIL="$quilt_author_email";
d3bd4ee1
EB
86 elif [ -n "$dry_run" ]; then
87 echo "No author found in $patch_name" >&2;
88 GIT_AUTHOR_NAME="dry-run-not-found";
89 GIT_AUTHOR_EMAIL="dry-run-not-found";
d3d8f361 90 else
d3bd4ee1 91 echo "No author found in $patch_name" >&2;
d3d8f361
EB
92 echo "---"
93 cat $tmp_msg
2aad957a 94 printf "Author: ";
d3d8f361
EB
95 read patch_author
96
97 echo "$patch_author"
98
99 patch_author_name=$(expr "z$patch_author" : 'z\(.*[^ ]\) *<.*') &&
100 patch_author_email=$(expr "z$patch_author" : '.*<\([^>]*\)') &&
101 test '' != "$patch_author_name" &&
102 test '' != "$patch_author_email" &&
103 GIT_AUTHOR_NAME="$patch_author_name" &&
104 GIT_AUTHOR_EMAIL="$patch_author_email"
105 fi
106 done
107 export GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
108 export SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
109 if [ -z "$SUBJECT" ] ; then
110 SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
111 fi
112
d3bd4ee1 113 if [ -z "$dry_run" ] ; then
5be60078
JH
114 git apply --index -C1 "$tmp_patch" &&
115 tree=$(git write-tree) &&
116 commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
117 git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
d3bd4ee1 118 fi
d3d8f361
EB
119done
120rm -rf $tmp_dir || exit 5