chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes/independent-help' into refs/top-bases/i/basis-merge
[topgit.git]
/
tg-import.sh
diff --git
a/tg-import.sh
b/tg-import.sh
index 424f51847ac750ee518e5d66b620cb900033a095..a8d3be5b3098d73c9b1dabfc9e1d509ae533a533 100644
(file)
--- a/
tg-import.sh
+++ b/
tg-import.sh
@@
-72,9
+72,12
@@
process_commit()
info "---- Importing $commit to $branch_name"
tg create "$branch_name" $basedep
basedep=
info "---- Importing $commit to $branch_name"
tg create "$branch_name" $basedep
basedep=
- git cherry-pick --no-commit "$commit"
get_commit_msg "$commit" > .topmsg
git add -f .topmsg .topdeps
get_commit_msg "$commit" > .topmsg
git add -f .topmsg .topdeps
+ if ! git cherry-pick --no-commit "$commit"; then
+ info "The commit will also finish the import of this patch."
+ exit 2
+ fi
git commit -C "$commit"
info "++++ Importing $commit finished"
}
git commit -C "$commit"
info "++++ Importing $commit finished"
}
@@
-113,3
+116,5
@@
do
esac
done
done
esac
done
done
+
+# vim:noet