]> git.ipfire.org Git - thirdparty/git.git/blame - git-quiltimport.sh
Git 1.7.8-rc2
[thirdparty/git.git] / git-quiltimport.sh
CommitLineData
d3d8f361 1#!/bin/sh
e01fbf1a
PH
2OPTIONS_KEEPDASHDASH=
3OPTIONS_SPEC="\
1b1dd23f 4git quiltimport [options]
e01fbf1a
PH
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 26 shift
9e384b45 27 QUILT_PATCHES="$1"
d3d8f361 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
51ef1daa 56tmp_dir="$GIT_DIR"/rebase-apply
d3d8f361
EB
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
6ab149ea 66while read patch_name level garbage <&3
9dd5bded
PH
67do
68 case "$patch_name" in ''|'#'*) continue;; esac
69 case "$level" in
18d077c1 70 -p*) ;;
9dd5bded
PH
71 ''|'#'*)
72 level=;;
73 *)
74 echo "unable to parse patch level, ignoring it."
75 level=;;
76 esac
77 case "$garbage" in
78 ''|'#'*);;
79 *)
80 echo "trailing garbage found in series file: $garbage"
81 exit 1;;
82 esac
9f569fe5
DN
83 if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
84 echo "$patch_name doesn't exist. Skipping."
85 continue
86 fi
d3d8f361 87 echo $patch_name
9d6f220c
JT
88 git mailinfo "$tmp_msg" "$tmp_patch" \
89 <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
90 test -s "$tmp_patch" || {
7d4f4a2f 91 echo "Patch is empty. Was it split wrong?"
1fa9bf36 92 exit 1
87ab7992 93 }
d3d8f361
EB
94
95 # Parse the author information
3addc94a
JS
96 GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
97 GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
98 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
d3d8f361
EB
99 while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do
100 if [ -n "$quilt_author" ] ; then
101 GIT_AUTHOR_NAME="$quilt_author_name";
102 GIT_AUTHOR_EMAIL="$quilt_author_email";
d3bd4ee1
EB
103 elif [ -n "$dry_run" ]; then
104 echo "No author found in $patch_name" >&2;
105 GIT_AUTHOR_NAME="dry-run-not-found";
106 GIT_AUTHOR_EMAIL="dry-run-not-found";
d3d8f361 107 else
d3bd4ee1 108 echo "No author found in $patch_name" >&2;
d3d8f361
EB
109 echo "---"
110 cat $tmp_msg
2aad957a 111 printf "Author: ";
d3d8f361
EB
112 read patch_author
113
114 echo "$patch_author"
115
116 patch_author_name=$(expr "z$patch_author" : 'z\(.*[^ ]\) *<.*') &&
117 patch_author_email=$(expr "z$patch_author" : '.*<\([^>]*\)') &&
118 test '' != "$patch_author_name" &&
119 test '' != "$patch_author_email" &&
120 GIT_AUTHOR_NAME="$patch_author_name" &&
121 GIT_AUTHOR_EMAIL="$patch_author_email"
122 fi
123 done
3addc94a
JS
124 GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
125 SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
126 export GIT_AUTHOR_DATE SUBJECT
d3d8f361
EB
127 if [ -z "$SUBJECT" ] ; then
128 SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
129 fi
130
d3bd4ee1 131 if [ -z "$dry_run" ] ; then
18d077c1 132 git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
5be60078
JH
133 tree=$(git write-tree) &&
134 commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
135 git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
d3bd4ee1 136 fi
6ab149ea 137done 3<"$QUILT_PATCHES/series"
d3d8f361 138rm -rf $tmp_dir || exit 5