Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Jul 25, 2010
  1. @cederlys

    Implemented "tg summary --sort".

    cederlys authored Uwe Kleine-König committed
    This uses tsort to sort the branches based on their dependency graph.
    Note: only a single sort order that fulfills the dependency graph is
    printed.  There may be many other possible orderings.
    
    A graphical text view would be much more useful, but this is till
    a lot better than nothing.
    
    Signed-off-by: Per Cederqvist <ceder@lysator.liu.se>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Apr 10, 2010
  1. tg patch: treat all files as ascii

    Uwe Kleine-König authored
    This fixes patching binary files, for a problem case check out
    http://bugs.debian.org/521173 .
    
    Closes: http://bugs.debian.org/521173
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. tg mail: document config setting to prevent unintended mass mail sending

    Uwe Kleine-König authored
    Addresses: http://bugs.debian.org/506306
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. Don't call pre-commit hook if tg is not installed

    Carsten Hey authored Uwe Kleine-König committed
    Signed-off-by: Carsten Hey <carsten@debian.org>
    Closes: http://bugs.debian.org/576221
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 15, 2010
  1. @tschwinge

    tg-delete: Handle the case where the branch has been removed already,…

    tschwinge authored Uwe Kleine-König committed
    … but the base is still left.
    
    A user might have used 'git branch -D B' to remove the branch B, and then
    certain TopGit commands complain, because the base of branch B is still there.
    
    Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 4, 2010
  1. @tschwinge

    tg-mail: Properly quote argument to --in-reply-to

    tschwinge authored Uwe Kleine-König committed
    Message-Ids usually contain < and >.  These need to be quoted.
    
    Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. @tschwinge

    tg-push: Filter out plain SHA1s from being pushed.

    tschwinge authored Uwe Kleine-König committed
    Otherwise, problems arise when branches depend (via .topdeps) on SHA1s:
    
        $ tg push -r tmp t/____longjmp_chk_cleanup_linux_x86_64
        fatal: 77c84aeb81808c3109665949448dba59965c391e cannot be resolved to branch.
        fatal: The remote end hung up unexpectedly
    
    Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Feb 2, 2010
  1. @wentasah

    Make 'tg patch' work in subdirectories

    wentasah authored Uwe Kleine-König committed
    When 'tg patch' is called from a subdirectory, it outputs only the
    commit message and no diff.
    
    Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Oct 27, 2009
  1. @madduck

    quote $LESS in case it includes spaces

    madduck authored
    Signed-off-by: martin f. krafft <madduck@debian.org>
  2. @madduck

    deal with single quotes in from/to headers

    madduck authored
    Signed-off-by: martin f. krafft <madduck@debian.org>
Commits on Sep 23, 2009
  1. bump version number to 0.8

    Uwe Kleine-König authored
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Sep 16, 2009
  1. @ringlej

    Fix tg export --quilt --numbered w/ > 8 patches

    ringlej authored Uwe Kleine-König committed
    Creating a quilt patch series with more than 8 patches with:
    tg export --quilt --numbered patchdir
    
    Causes the following error to be produced:
    eval: 1: arithmetic expression: expecting EOF: "0008 + 1"
    
    This is due to the leading 0 and the $(()) evaluates as octal rather
    than decimal.
    
    Add the leading zeros only to the filename, not the number itself.
    
    Signed-off-by: Jon Ringle <jon@ringle.org>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Jun 4, 2009
  1. @bertwesarg

    tg-push: add bash completion

    bertwesarg authored Uwe Kleine-König committed
    Include all options.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. @bertwesarg

    help: use pager

    bertwesarg authored Uwe Kleine-König committed
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on May 28, 2009
  1. @bertwesarg

    tg-push: handle non-tgish branches

    bertwesarg authored Uwe Kleine-König committed
    tg push died if you gave it a non-tgish branch:
    
    	$ tg push -r push-test master
    	fatal: Not a valid object name refs/top-bases/master
    	fatal: ambiguous argument '^{tree}': unknown revision or path not in the working tree.
    	Use '--' to separate paths from revisions
    	fatal: Not a valid object name master:.topdeps
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. @bertwesarg

    tg-push: prevent handing branches more than once to git-push

    bertwesarg authored Uwe Kleine-König committed
    Doing otherwise can result in a lot of warnings and errors:
    
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    	warning, no base found top-bases/master
    
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/master is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/master
    	error: Ref refs/heads/bw/log is at a16df35cc7009b36f6f71717ae3d9a3dc29987da but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/heads/bw/log
    	error: Ref refs/top-bases/bw/log is at b725fc9 but expected 0000000000000000000000000000000000000000
    	error: failed to lock refs/top-bases/bw/log
    
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] master -> master (failed to lock)
    	 ! [remote rejected] bw/log -> bw/log (failed to lock)
    	 ! [remote rejected] refs/top-bases/bw/log -> refs/top-bases/bw/log (failed to lock)
    
    Note, the result is OK only the output is irritating.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  3. @bertwesarg

    tg-push: remove useless warning about missing bases for non-tgish bra…

    bertwesarg authored Uwe Kleine-König committed
    …nches
    
    The call to ref_exists() isn't needed because $_dep_is_tgish from
    recurse_deps() gives us exactly this information.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  4. tg-update: fix user visible typo in info msg

    Ilpo Järvinen authored Uwe Kleine-König committed
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Commits on May 13, 2009
  1. tg-remote: don't add push specs but warn about existing ones.

    Uwe Kleine-König authored
    topgit used to add some push specs to assert that topbases are pushed,
    too.  This should now be handled by tg-push.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Marc Weber <marco-oweber@gmx.de>
    Tested-and-acked-by: martin f. krafft <madduck@debian.org>
    Cc: 528442@bugs.debian.org
Commits on May 12, 2009
  1. @MarcWeber

    tg-push: new command pushing a tgish branch

    MarcWeber authored Uwe Kleine-König committed
    It pushes recursively all deps and bases together with the branch.
    
    Signed-off-by: Marc Weber <marco-oweber@gmx.de>
    Tested-and-acked-by: martin f. krafft <madduck@madduck.net>
    [ukleinek: fixed some nitpicks and changed remote handling]
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Marc Weber <marco-oweber@gmx.de>
  2. recurse_deps: if no_remotes is set don't recurse into remote deps

    Uwe Kleine-König authored
    This is based on a patch by Marc Weber.  It will be used by tg-push.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: Marc Weber <marco-oweber@gmx.de>
Commits on May 10, 2009
  1. remove test for git send-email

    Uwe Kleine-König authored
    This test didn't work as expected with certain pagers (e.g. vimpager)
    when stdout is redirected to a non-terminal.  Now it's the actual call
    to git send-email that generates a very similar error message.
    
    Reported-by: Antonio Ospite <ospite@studenti.unina.it>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-and-tested-by: Antonio Ospite <ospite@studenti.unina.it>
Commits on Apr 20, 2009
  1. depend: don't disallow adding a dependency on a non-TopGit-branch

    Uwe Kleine-König authored
    there is no techical reason not to depend on more than one
    non-TopGit-branch.  You can argue if you want it though.  This patch
    lets you decide if you want it or not.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 26, 2009
  1. hooks/pre-commit.sh: fix bashism

    Uwe Kleine-König authored
    This was introduced in fcb488d.
    A similar fix was suggested by martin f krafft, too.
    
    Reported-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Acked-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Tested-by: Bert Wesarg <bert.wesarg@googlemail.com>
Commits on Mar 24, 2009
  1. hooks/pre-commit.sh: don't stop commits on non-topgit branches

    Uwe Kleine-König authored
    This is a regression introduced by c32d1dd
    
    "${head_#refs/heads/#refs/top-bases#}" doesn't substitute refs/heads by
    refs/top-bases, but strips the prefix of $head_ if it starts with
    "refs/heads/#refs/top-bases#".
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. don't use return when being sourced

    Uwe Kleine-König authored
    Fabien Thomas reports that a Bourne (not Again) sh on FreeBSD just
    ignores the return and continues executing with the rest of the script.
    
    So just wrap everything that was skipped by the return using other
    shells in a big if instead.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Closes: http://bugs.debian.org/516188
Commits on Mar 20, 2009
  1. hooks/pre-commit.sh: don't wail on detached head for missing .top* files

    Uwe Kleine-König authored
    This fixes a warning
    
    	fatal: ref HEAD is not a symbolic ref
    
    when your HEAD is detached.
    
    And branches under refs/top-bases/ don't need these files either.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 13, 2009
  1. Add GPLv2 and description for S-o-b

    Uwe Kleine-König authored
    The intend is to clearify the copyright situation.  I'm not a lawyer,
    but it should now be better than before.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 8, 2009
  1. Call git-rerere after a failing merge as git-merge does

    Uwe Kleine-König authored
    This maybe does all the hard work for you ...
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. Fix merge failure handling in tg export

    Uwe Kleine-König authored
    There exist two problems that show that up to now the error handling was
    completely untested:
    
      - tg.sh uses `set -e`, so `git merge $branch; retmerge=$?` obviously
        doesn't do the right thing.
      - in recurse_deps stdin is redirected from $_depsfile.  Starting a
        shell with that doesn't give the user any chance to do something.
    
    Reported-by: "Bernhard R. Link" <brlink@debian.org>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 7, 2009
  1. Pass -- to diff-tree for branch/filename disambiguation

    Uwe Kleine-König authored
    Script to show the need of this patch:
    
    	mkdir ty;
    	cd ty;
    	git init-db;
    	touch a;
    	git add a;
    	git commit -m "...";
    	tg create bla;
    	git commit -m "...";
    	mkdir bla;
    	touch bla/blub;
    	git add bla/blub;
    	git commit -m "...";
    	tg export --quilt tt;
    
    Reported-by: "Bernhard R. Link" <brlink@debian.org>
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 5, 2009
  1. bump version number to 0.7

    Uwe Kleine-König authored
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Commits on Mar 3, 2009
  1. Fix typo s/emmail/email/

    Uwe Kleine-König authored
    This was introduced by a tired coder in d479474.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  2. Add documentation for tg export --linearize

    Uwe Kleine-König authored
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Something went wrong with that request. Please try again.