#!/bin/sh OPTIONS_KEEPDASHDASH= OPTIONS_STUCKLONG= OPTIONS_SPEC="\ git quiltimport [options] -- n,dry-run dry run author= author name and email address for patches without any patches= path to the quilt patches series= path to the quilt series file keep-non-patch Pass -b to git mailinfo " SUBDIRECTORY_ON=Yes . git-sh-setup dry_run="" quilt_author="" while test $# != 0 do case "$1" in --author) shift quilt_author="$1" ;; -n|--dry-run) dry_run=1 ;; --patches) shift QUILT_PATCHES="$1" ;; --series) shift QUILT_SERIES="$1" ;; --keep-non-patch) MAILINFO_OPT="-b" ;; --) shift break;; *) usage ;; esac shift done # Quilt Author if [ -n "$quilt_author" ] ; then quilt_author_name=$(expr "z$quilt_author" : 'z\(.*[^ ]\) *<.*') && quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') && test '' != "$quilt_author_name" && test '' != "$quilt_author_email" || die "malformed --author parameter" fi # Quilt patch directory : ${QUILT_PATCHES:=patches} if ! [ -d "$QUILT_PATCHES" ] ; then echo "The \"$QUILT_PATCHES\" directory does not exist." exit 1 fi # Quilt series file : ${QUILT_SERIES:=$QUILT_PATCHES/series} if ! [ -e "$QUILT_SERIES" ] ; then echo "The \"$QUILT_SERIES\" file does not exist." exit 1 fi # Temporary directories tmp_dir="$GIT_DIR"/rebase-apply tmp_msg="$tmp_dir/msg" tmp_patch="$tmp_dir/patch" tmp_info="$tmp_dir/info" # Find the initial commit commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2 while read patch_name level garbage <&3 do case "$patch_name" in ''|'#'*) continue;; esac case "$level" in -p*) ;; ''|'#'*) level=;; *) echo "unable to parse patch level, ignoring it." level=;; esac case "$garbage" in ''|'#'*);; *) echo "trailing garbage found in series file: $garbage" exit 1;; esac if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then echo "$patch_name doesn't exist. Skipping." continue fi echo $patch_name git mailinfo $MAILINFO_OPT "$tmp_msg" "$tmp_patch" \ <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3 test -s "$tmp_patch" || { echo "Patch is empty. Was it split wrong?" exit 1 } # Parse the author information GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info") GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info") export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do if [ -n "$quilt_author" ] ; then GIT_AUTHOR_NAME="$quilt_author_name"; GIT_AUTHOR_EMAIL="$quilt_author_email"; elif [ -n "$dry_run" ]; then echo "No author found in $patch_name" >&2; GIT_AUTHOR_NAME="dry-run-not-found"; GIT_AUTHOR_EMAIL="dry-run-not-found"; else echo "No author found in $patch_name" >&2; echo "---" cat $tmp_msg printf "Author: "; read patch_author echo "$patch_author" patch_author_name=$(expr "z$patch_author" : 'z\(.*[^ ]\) *<.*') && patch_author_email=$(expr "z$patch_author" : '.*<\([^>]*\)') && test '' != "$patch_author_name" && test '' != "$patch_author_email" && GIT_AUTHOR_NAME="$patch_author_name" && GIT_AUTHOR_EMAIL="$patch_author_email" fi done GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info") SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info") export GIT_AUTHOR_DATE SUBJECT if [ -z "$SUBJECT" ] ; then SUBJECT=$(echo $patch_name | sed -e 's/.patch$//') fi if [ -z "$dry_run" ] ; then git apply --index -C1 ${level:+"$level"} "$tmp_patch" && tree=$(git write-tree) && commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) && git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4 fi done 3<"$QUILT_SERIES" rm -rf $tmp_dir || exit 5
Name | Type | Size | Permission | Actions |
---|---|---|---|---|
mergetools | Folder | 0755 |
|
|
git | File | 3.67 MB | 0755 |
|
git-add | File | 3.67 MB | 0755 |
|
git-am | File | 3.67 MB | 0755 |
|
git-annotate | File | 3.67 MB | 0755 |
|
git-apply | File | 3.67 MB | 0755 |
|
git-archive | File | 3.67 MB | 0755 |
|
git-bisect | File | 3.67 MB | 0755 |
|
git-blame | File | 3.67 MB | 0755 |
|
git-branch | File | 3.67 MB | 0755 |
|
git-bugreport | File | 3.67 MB | 0755 |
|
git-bundle | File | 3.67 MB | 0755 |
|
git-cat-file | File | 3.67 MB | 0755 |
|
git-check-attr | File | 3.67 MB | 0755 |
|
git-check-ignore | File | 3.67 MB | 0755 |
|
git-check-mailmap | File | 3.67 MB | 0755 |
|
git-check-ref-format | File | 3.67 MB | 0755 |
|
git-checkout | File | 3.67 MB | 0755 |
|
git-checkout--worker | File | 3.67 MB | 0755 |
|
git-checkout-index | File | 3.67 MB | 0755 |
|
git-cherry | File | 3.67 MB | 0755 |
|
git-cherry-pick | File | 3.67 MB | 0755 |
|
git-clean | File | 3.67 MB | 0755 |
|
git-clone | File | 3.67 MB | 0755 |
|
git-column | File | 3.67 MB | 0755 |
|
git-commit | File | 3.67 MB | 0755 |
|
git-commit-graph | File | 3.67 MB | 0755 |
|
git-commit-tree | File | 3.67 MB | 0755 |
|
git-config | File | 3.67 MB | 0755 |
|
git-contacts | File | 4.4 KB | 0755 |
|
git-count-objects | File | 3.67 MB | 0755 |
|
git-credential | File | 3.67 MB | 0755 |
|
git-credential-cache | File | 3.67 MB | 0755 |
|
git-credential-cache--daemon | File | 3.67 MB | 0755 |
|
git-credential-netrc | File | 10.69 KB | 0755 |
|
git-credential-store | File | 3.67 MB | 0755 |
|
git-describe | File | 3.67 MB | 0755 |
|
git-diagnose | File | 3.67 MB | 0755 |
|
git-diff | File | 3.67 MB | 0755 |
|
git-diff-files | File | 3.67 MB | 0755 |
|
git-diff-index | File | 3.67 MB | 0755 |
|
git-diff-tree | File | 3.67 MB | 0755 |
|
git-difftool | File | 3.67 MB | 0755 |
|
git-difftool--helper | File | 2.55 KB | 0755 |
|
git-fast-export | File | 3.67 MB | 0755 |
|
git-fast-import | File | 3.67 MB | 0755 |
|
git-fetch | File | 3.67 MB | 0755 |
|
git-fetch-pack | File | 3.67 MB | 0755 |
|
git-filter-branch | File | 15.49 KB | 0755 |
|
git-fmt-merge-msg | File | 3.67 MB | 0755 |
|
git-for-each-ref | File | 3.67 MB | 0755 |
|
git-for-each-repo | File | 3.67 MB | 0755 |
|
git-format-patch | File | 3.67 MB | 0755 |
|
git-fsck | File | 3.67 MB | 0755 |
|
git-fsck-objects | File | 3.67 MB | 0755 |
|
git-fsmonitor--daemon | File | 3.67 MB | 0755 |
|
git-gc | File | 3.67 MB | 0755 |
|
git-get-tar-commit-id | File | 3.67 MB | 0755 |
|
git-grep | File | 3.67 MB | 0755 |
|
git-hash-object | File | 3.67 MB | 0755 |
|
git-help | File | 3.67 MB | 0755 |
|
git-hook | File | 3.67 MB | 0755 |
|
git-http-backend | File | 2.14 MB | 0755 |
|
git-http-fetch | File | 2.17 MB | 0755 |
|
git-http-push | File | 2.19 MB | 0755 |
|
git-imap-send | File | 2.19 MB | 0755 |
|
git-index-pack | File | 3.67 MB | 0755 |
|
git-init | File | 3.67 MB | 0755 |
|
git-init-db | File | 3.67 MB | 0755 |
|
git-interpret-trailers | File | 3.67 MB | 0755 |
|
git-log | File | 3.67 MB | 0755 |
|
git-ls-files | File | 3.67 MB | 0755 |
|
git-ls-remote | File | 3.67 MB | 0755 |
|
git-ls-tree | File | 3.67 MB | 0755 |
|
git-mailinfo | File | 3.67 MB | 0755 |
|
git-mailsplit | File | 3.67 MB | 0755 |
|
git-maintenance | File | 3.67 MB | 0755 |
|
git-merge | File | 3.67 MB | 0755 |
|
git-merge-base | File | 3.67 MB | 0755 |
|
git-merge-file | File | 3.67 MB | 0755 |
|
git-merge-index | File | 3.67 MB | 0755 |
|
git-merge-octopus | File | 2.42 KB | 0755 |
|
git-merge-one-file | File | 3.61 KB | 0755 |
|
git-merge-ours | File | 3.67 MB | 0755 |
|
git-merge-recursive | File | 3.67 MB | 0755 |
|
git-merge-resolve | File | 1.2 KB | 0755 |
|
git-merge-subtree | File | 3.67 MB | 0755 |
|
git-merge-tree | File | 3.67 MB | 0755 |
|
git-mergetool | File | 11.42 KB | 0755 |
|
git-mergetool--lib | File | 10.48 KB | 0644 |
|
git-mktag | File | 3.67 MB | 0755 |
|
git-mktree | File | 3.67 MB | 0755 |
|
git-multi-pack-index | File | 3.67 MB | 0755 |
|
git-mv | File | 3.67 MB | 0755 |
|
git-name-rev | File | 3.67 MB | 0755 |
|
git-notes | File | 3.67 MB | 0755 |
|
git-pack-objects | File | 3.67 MB | 0755 |
|
git-pack-redundant | File | 3.67 MB | 0755 |
|
git-pack-refs | File | 3.67 MB | 0755 |
|
git-patch-id | File | 3.67 MB | 0755 |
|
git-prune | File | 3.67 MB | 0755 |
|
git-prune-packed | File | 3.67 MB | 0755 |
|
git-pull | File | 3.67 MB | 0755 |
|
git-push | File | 3.67 MB | 0755 |
|
git-quiltimport | File | 3.61 KB | 0755 |
|
git-range-diff | File | 3.67 MB | 0755 |
|
git-read-tree | File | 3.67 MB | 0755 |
|
git-rebase | File | 3.67 MB | 0755 |
|
git-receive-pack | File | 3.67 MB | 0755 |
|
git-reflog | File | 3.67 MB | 0755 |
|
git-remote | File | 3.67 MB | 0755 |
|
git-remote-ext | File | 3.67 MB | 0755 |
|
git-remote-fd | File | 3.67 MB | 0755 |
|
git-remote-ftp | File | 2.19 MB | 0755 |
|
git-remote-ftps | File | 2.19 MB | 0755 |
|
git-remote-http | File | 2.19 MB | 0755 |
|
git-remote-https | File | 2.19 MB | 0755 |
|
git-repack | File | 3.67 MB | 0755 |
|
git-replace | File | 3.67 MB | 0755 |
|
git-request-pull | File | 4.05 KB | 0755 |
|
git-rerere | File | 3.67 MB | 0755 |
|
git-reset | File | 3.67 MB | 0755 |
|
git-restore | File | 3.67 MB | 0755 |
|
git-rev-list | File | 3.67 MB | 0755 |
|
git-rev-parse | File | 3.67 MB | 0755 |
|
git-revert | File | 3.67 MB | 0755 |
|
git-rm | File | 3.67 MB | 0755 |
|
git-send-pack | File | 3.67 MB | 0755 |
|
git-sh-i18n | File | 1.64 KB | 0644 |
|
git-sh-i18n--envsubst | File | 2.13 MB | 0755 |
|
git-sh-setup | File | 8.2 KB | 0644 |
|
git-shell | File | 2.13 MB | 0755 |
|
git-shortlog | File | 3.67 MB | 0755 |
|
git-show | File | 3.67 MB | 0755 |
|
git-show-branch | File | 3.67 MB | 0755 |
|
git-show-index | File | 3.67 MB | 0755 |
|
git-show-ref | File | 3.67 MB | 0755 |
|
git-sparse-checkout | File | 3.67 MB | 0755 |
|
git-stage | File | 3.67 MB | 0755 |
|
git-stash | File | 3.67 MB | 0755 |
|
git-status | File | 3.67 MB | 0755 |
|
git-stripspace | File | 3.67 MB | 0755 |
|
git-submodule | File | 10.26 KB | 0755 |
|
git-submodule--helper | File | 3.67 MB | 0755 |
|
git-switch | File | 3.67 MB | 0755 |
|
git-symbolic-ref | File | 3.67 MB | 0755 |
|
git-tag | File | 3.67 MB | 0755 |
|
git-unpack-file | File | 3.67 MB | 0755 |
|
git-unpack-objects | File | 3.67 MB | 0755 |
|
git-update-index | File | 3.67 MB | 0755 |
|
git-update-ref | File | 3.67 MB | 0755 |
|
git-update-server-info | File | 3.67 MB | 0755 |
|
git-upload-archive | File | 3.67 MB | 0755 |
|
git-upload-pack | File | 3.67 MB | 0755 |
|
git-var | File | 3.67 MB | 0755 |
|
git-verify-commit | File | 3.67 MB | 0755 |
|
git-verify-pack | File | 3.67 MB | 0755 |
|
git-verify-tag | File | 3.67 MB | 0755 |
|
git-version | File | 3.67 MB | 0755 |
|
git-web--browse | File | 4.3 KB | 0755 |
|
git-whatchanged | File | 3.67 MB | 0755 |
|
git-worktree | File | 3.67 MB | 0755 |
|
git-write-tree | File | 3.67 MB | 0755 |
|
scalar | File | 2.18 MB | 0755 |
|