{
if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
{
- echo -e ".topmsg\tmerge=ours"
- echo -e ".topdeps\tmerge=ours"
+ echo ".topmsg merge=ours"
+ echo ".topdeps merge=ours"
} >>"$git_dir/info/attributes"
fi
if ! git config merge.ours.driver >/dev/null; then
# Shoo shoo, keep our environment alone!
[ -z "$_dep_is_tgish" ] ||
- (needs_update "$_cmd" "$_dep" "$@") ||
+ (recurse_deps "$_cmd" "$_dep" "$@") ||
_ret=$?
eval "$_cmd"
# _dep needs to be synced with its base
echo ": $_dep $_depchain"
_ret=1
- elif ! branch_contains "refs/top-bases/$1" "$_dep"; then
+ elif [ -n "$_name" ] && ! branch_contains "refs/top-bases/$_name" "$_dep"; then
# Some new commits in _dep
echo "$_dep $_depchain"
_ret=1
sep="|"
done
- echo "TopGit v0.1 - A different patch queue manager"
+ echo "TopGit v0.2 - A different patch queue manager"
echo "Usage: tg ($cmds|help) ..."
elif [ -r "@sharedir@/tg-$1.txt" ] ; then
cat "@sharedir@/tg-$1.txt"