git-rebase--interactive.sh: Make 3-way merge strategies work for -p.
[git/platforms.git] / git-quiltimport.sh
blob880c81d121bfb9555c729bc299f8ae8baf1db32c
1 #!/bin/sh
2 USAGE='--dry-run --author <author> --patches </path/to/quilt/patch/directory>'
3 SUBDIRECTORY_ON=Yes
4 . git-sh-setup
6 dry_run=""
7 quilt_author=""
8 while test $# != 0
9 do
10 case "$1" in
11 --au=*|--aut=*|--auth=*|--autho=*|--author=*)
12 quilt_author=$(expr "z$1" : 'z-[^=]*\(.*\)')
13 shift
16 --au|--aut|--auth|--autho|--author)
17 case "$#" in 1) usage ;; esac
18 shift
19 quilt_author="$1"
20 shift
23 --dry-run)
24 shift
25 dry_run=1
28 --pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
29 QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
30 shift
33 --pa|--pat|--patc|--patch|--patche|--patches)
34 case "$#" in 1) usage ;; esac
35 shift
36 QUILT_PATCHES="$1"
37 shift
41 break
43 esac
44 done
46 # Quilt Author
47 if [ -n "$quilt_author" ] ; then
48 quilt_author_name=$(expr "z$quilt_author" : 'z\(.*[^ ]\) *<.*') &&
49 quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
50 test '' != "$quilt_author_name" &&
51 test '' != "$quilt_author_email" ||
52 die "malformed --author parameter"
55 # Quilt patch directory
56 : ${QUILT_PATCHES:=patches}
57 if ! [ -d "$QUILT_PATCHES" ] ; then
58 echo "The \"$QUILT_PATCHES\" directory does not exist."
59 exit 1
62 # Temporary directories
63 tmp_dir=.dotest
64 tmp_msg="$tmp_dir/msg"
65 tmp_patch="$tmp_dir/patch"
66 tmp_info="$tmp_dir/info"
69 # Find the intial commit
70 commit=$(git rev-parse HEAD)
72 mkdir $tmp_dir || exit 2
73 for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
74 if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
75 echo "$patch_name doesn't exist. Skipping."
76 continue
78 echo $patch_name
79 git mailinfo "$tmp_msg" "$tmp_patch" \
80 <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
81 test -s "$tmp_patch" || {
82 echo "Patch is empty. Was it split wrong?"
83 exit 1
86 # Parse the author information
87 export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
88 export GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
89 while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do
90 if [ -n "$quilt_author" ] ; then
91 GIT_AUTHOR_NAME="$quilt_author_name";
92 GIT_AUTHOR_EMAIL="$quilt_author_email";
93 elif [ -n "$dry_run" ]; then
94 echo "No author found in $patch_name" >&2;
95 GIT_AUTHOR_NAME="dry-run-not-found";
96 GIT_AUTHOR_EMAIL="dry-run-not-found";
97 else
98 echo "No author found in $patch_name" >&2;
99 echo "---"
100 cat $tmp_msg
101 printf "Author: ";
102 read patch_author
104 echo "$patch_author"
106 patch_author_name=$(expr "z$patch_author" : 'z\(.*[^ ]\) *<.*') &&
107 patch_author_email=$(expr "z$patch_author" : '.*<\([^>]*\)') &&
108 test '' != "$patch_author_name" &&
109 test '' != "$patch_author_email" &&
110 GIT_AUTHOR_NAME="$patch_author_name" &&
111 GIT_AUTHOR_EMAIL="$patch_author_email"
113 done
114 export GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
115 export SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
116 if [ -z "$SUBJECT" ] ; then
117 SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
120 if [ -z "$dry_run" ] ; then
121 git apply --index -C1 "$tmp_patch" &&
122 tree=$(git write-tree) &&
123 commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
124 git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
126 done
127 rm -rf $tmp_dir || exit 5