From: Per Cederqvist Date: Tue, 24 Aug 2010 18:32:05 +0000 (+0200) Subject: Add "tg base" that prints the base version. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=913035b61e5ee1a583ff45014154e383a56c3292 Add "tg base" that prints the base version. Signed-off-by: Per Cederqvist Signed-off-by: Uwe Kleine-König --- diff --git a/.gitignore b/.gitignore index 357de1f..0342e09 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ /hooks/pre-commit /tg +/tg-base +/tg-base.txt /tg-create /tg-create.txt /tg-delete diff --git a/README b/README index d7dfb5f..f103d92 100644 --- a/README +++ b/README @@ -508,6 +508,21 @@ tg push repository. By default the remote gets all dependencies (both tgish and non-tgish) and bases pushed to. +tg base +~~~~~~~ + Prints the base commit of the current topic branch. Silently + exits with exit code 1 if you are not working on a TopGit + branch. The following command can be useful to get a summary + of the work you have made on a topic branch: + + git log --first-parent --no-merges `tg base`.. + + (Note: if you have shared the TopGit branch, the above command + only lists the commits that were made in the current + repository, so you will not see work done by your + collaborators.) + + TODO: tg rename diff --git a/tg-base.sh b/tg-base.sh new file mode 100644 index 0000000..d28cac1 --- /dev/null +++ b/tg-base.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# TopGit - A different patch queue manager +# (c) Petr Baudis 2008 +# (c) Per Cederqvist 2010 +# GPLv2 + +name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')" +base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" || exit 1 +echo $base_rev