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 commit 'refs/top-bases/debian/locations' into debian/locations
[topgit.git]
/
tg-export.sh
diff --git
a/tg-export.sh
b/tg-export.sh
index 748ca54f6c093480684d53982ba72e82daedb412..a16c2901d0a53b4ca8295e9e2ebc9efd5a82048a 100644
(file)
--- a/
tg-export.sh
+++ b/
tg-export.sh
@@
-185,8
+185,8
@@
quilt()
echo "Skip empty patch $_dep";
else
if "$numbered"; then
echo "Skip empty patch $_dep";
else
if "$numbered"; then
- number="$(
printf "%04u"
$(($(cat "$playground/^number" 2>/dev/null) + 1)))";
- bn="$
number-$bn
";
+ number="$(
echo
$(($(cat "$playground/^number" 2>/dev/null) + 1)))";
+ bn="$
(printf "%04u-$bn" $number)
";
echo "$number" >"$playground/^number";
fi;
echo "$number" >"$playground/^number";
fi;
@@
-216,22
+216,25
@@
linearize()
# already included, just skip
:;
else
# already included, just skip
:;
else
- git merge -s recursive "$_dep";
- retmerge="$?";
+ retmerge=0;
+
+ git merge -s recursive "$_dep" || retmerge="$?";
if test "x$retmerge" != "x0"; then
echo fix up the merge, commit and then exit;
#todo error handling
if test "x$retmerge" != "x0"; then
echo fix up the merge, commit and then exit;
#todo error handling
- sh -i
+ sh -i
</dev/tty;
fi;
fi;
else
fi;
fi;
else
- git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")";
- retmerge="$?";
+ retmerge=0;
+
+ git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
if test "x$retmerge" != "x0"; then
if test "x$retmerge" != "x0"; then
+ git rerere;
echo "fix up the merge and update the index. Don't commit!"
#todo error handling
echo "fix up the merge and update the index. Don't commit!"
#todo error handling
- sh -i
+ sh -i
</dev/tty;
fi
result_tree=$(git write-tree)
fi
result_tree=$(git write-tree)