rpms/gdb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Improve error handling on generate-* scripts

Browse Source
This commit is contained in:
Sergio Durigan Junior 2018-07-25 17:35:59 -04:00
parent 2f6fc56e9a
commit 2e649f71e0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generate-git-repo-from-patches.sh
View File

@ -35,8 +35,14 @@ test -f _git_upstream_commit || die "Cannot find _git_upstream_commit file."
test -f _patch_order || die "Cannot find _patch_order file." test -f _patch_order || die "Cannot find _patch_order file."
last_ancestor_commit=`cat _git_upstream_commit` last_ancestor_commit=`cat _git_upstream_commit`
cd $1 cd $1
git name-rev $last_ancestor_commit
test $? -eq 0 || die "Could not find $last_ancestor_commit in the repository $1. Did you run 'git fetch'?"
git checkout $last_ancestor_commit git checkout $last_ancestor_commit
for p in `cat ../_patch_order` ; do for p in `cat ../_patch_order` ; do
git am ../$p git am ../$p
test $? -eq 0 || die "Could not apply patch '$p'."
done done

4
generate-patches-from-git-repo.sh
View File

@ -51,6 +51,10 @@ for f in `cat _patch_order` ; do
done done
cd $1 cd $1
git name-rev $commit_or_tag
test $? -eq 0 || die "Could not find $commit_or_tag in the repository. Did you run 'git fetch'?"
idx=1 idx=1
common_ancestor=`git merge-base HEAD $commit_or_tag` common_ancestor=`git merge-base HEAD $commit_or_tag`