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:
ff5a9f5
)
tg-create.sh: Fix several bugs when resuming after conflicts
author
Petr Baudis
<pasky@suse.cz>
Sun, 3 Aug 2008 01:56:34 +0000
(
03:56
+0200)
committer
Petr Baudis
<pasky@suse.cz>
Sun, 3 Aug 2008 01:56:34 +0000
(
03:56
+0200)
tg-create.sh
patch
|
blob
|
history
diff --git
a/tg-create.sh
b/tg-create.sh
index 8d39f46fe7c067438ff0249e2c4f7c865622ea8b..30c69c9ee1929ba80af155e46e704c4e339f7d73 100644
(file)
--- a/
tg-create.sh
+++ b/
tg-create.sh
@@
-30,12
+30,12
@@
done
if [ -z "$deps" ]; then
head="$(git symbolic-ref HEAD)"
if [ -z "$deps" ]; then
head="$(git symbolic-ref HEAD)"
- bname="${head
s
#refs/top-bases/}"
+ bname="${head#refs/top-bases/}"
if [ "$bname" != "$head" -a -s "$git_dir/top-deps" -a -s "$git_dir/top-merge" ]; then
# We are on a base branch now; resume merge!
deps="$(cat "$git_dir/top-deps")"
if [ "$bname" != "$head" -a -s "$git_dir/top-deps" -a -s "$git_dir/top-merge" ]; then
# We are on a base branch now; resume merge!
deps="$(cat "$git_dir/top-deps")"
- merge="$(cat "$git_dir/top-merge")
"
- name="$b
as
e"
+ merge="$(cat "$git_dir/top-merge")"
+ name="$b
nam
e"
restarted=1
info "Resuming $name setup..."
else
restarted=1
info "Resuming $name setup..."
else