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