chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
67ae5b2
)
tg import: More graceful conflicts handling
author
Petr Baudis
<pasky@suse.cz>
Thu, 25 Sep 2008 18:50:25 +0000
(20:50 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Thu, 25 Sep 2008 18:50:25 +0000
(20:50 +0200)
tg-import.sh
patch
|
blob
|
history
diff --git
a/tg-import.sh
b/tg-import.sh
index 424f51847ac750ee518e5d66b620cb900033a095..b036b8645f184f54ca14878cdc02312f4f925eaf 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=
- git cherry-pick --no-commit "$commit"
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"
}