aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-12-10 16:07:37 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-12-10 16:07:37 +0100
commitff7797932f04a625d92d7e63e9af5bfbe1076a9d (patch)
treea17fcd130ef15482f6a4823b95b50ac2043b7a46 /docs
parent093704c9c7e16d71659c49661ce91c605bfabd45 (diff)
git-buildpackage: detect the branch we're on and bail out if it's not the debian branchdebian/0.2.18
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/git-buildpackage.sgml46
-rw-r--r--docs/manpages/git-import-dsc.sgml26
-rw-r--r--docs/manpages/git-import-orig.sgml26
-rw-r--r--docs/manpages/manpages.ent21
4 files changed, 47 insertions, 72 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 0a151e0..bf473af 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -24,12 +24,14 @@
<refsynopsisdiv>
<cmdsynopsis>
&git-buildpackage;
-
<arg><option>--git-ignore-new</option></arg>
<arg><option>--git-tag</option></arg>
<arg><option>--git-verbose</option></arg>
<arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
+ <arg><option>--debian-branch=<replaceable>branch_name</replaceable></option></arg>
<arg><option>--git-builder=<replaceable>BUILD_CMD</replaceable></option></arg>
+ <arg><option>--git-sign-tags</option></arg>
+ <arg><option>--git-keyid</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@@ -44,6 +46,12 @@
<listitem><para>Verify that it is being executed from the
proper location.</para>
</listitem>
+ <listitem><para>Verify that the reopository doesn't contain any
+ uncommitted source changes.</para>
+ </listitem>
+ <listitem><para>Verify that it is being executed from the
+ correct branch.</para>
+ </listitem>
<listitem><para>Build an orig.tar.gz if it doesn't exist.</para>
</listitem>
<listitem><para>Call <application>debuild</application> (1)
@@ -80,8 +88,6 @@
<para>Use <replaceable>BUILD_CMD</replaceable> instead of <command>debuild</command></para>
</listitem>
</varlistentry>
- </variablelist>
- <variablelist>
<varlistentry>
<term><option>--git-verbose</option>
</term>
@@ -96,34 +102,22 @@
<para>Branch to build the orig.tar.gz from. Default is 'upstream'</para>
</listitem>
</varlistentry>
- </variablelist>
- </refsect1>
- <refsect1>
- <title>CONFIGURATION FILES</title>
- Three configuration files are parsed:
- <variablelist>
<varlistentry>
- <term>/etc/git-buildpacakge/gbp.conf</term>
- </varlistentry>
- <varlistitem>- system wide configuraton</varlistitem>
- <varlistentry>
- <term>~/.gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per user configuration
+ <term><option>--git-debian-branch</option>=<replaceable>branch_name</replaceable>
+ </term>
+ <listitem>
+ <para>If you're not on this branch when invoking &git-buildpackage;
+ it will fail. Default is 'master'. This option will be ignored
+ when using <option>--git-ignore-new</option>.
+ </para>
+ </listitem>
</varlistentry>
- <varlistentry>
- <term>\.git/gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per repository configuration
- </varlistentry>
</variablelist>
- <para>
- See /etc/git-buildpacakge/gbp.conf for an example.
- </para>
</refsect1>
<refsect1>
+ &man.git.config-files;
+ <para>All options in the config files are specified without the 'git-' prefix.
+ <refsect1>
<title>SEE ALSO</title>
<para>git-import-dsc (1), git-import-orig (1), debuild (1), git (1)</para>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 7dec2f6..42c0fa7 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -28,6 +28,8 @@
<arg><option>--verbose</option></arg>
<arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
+ <arg><option>--sign-tags</option></arg>
+ <arg><option>--keyid</option></arg>
<arg choice="plain"><replaceable>dsc_file</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -61,29 +63,7 @@
</variablelist>
</refsect1>
<refsect1>
- <title>CONFIGURATION FILES</title>
- Three configuration files are parsed:
- <variablelist>
- <varlistentry>
- <term>/etc/git-buildpacakge/gbp.conf</term>
- </varlistentry>
- <varlistitem>- system wide configuraton</varlistitem>
- <varlistentry>
- <term>~/.gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per user configuration
- </varlistentry>
- <varlistentry>
- <term>\.git/gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per repository configuration
- </varlistentry>
- </variablelist>
- <para>
- See /etc/git-buildpacakge/gbp.conf for an example.
- </para>
+ &man.git.config-files;
</refsect1>
<refsect1>
<title>SEE ALSO</title>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 0e50739..7bc169a 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -30,6 +30,8 @@
<arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
<arg><option>--debian-branch=<replaceable>branch_name</replaceable></option></arg>
<arg><option>--upstream-version=<replaceable>version</replaceable></option></arg>
+ <arg><option>--sign-tags</option></arg>
+ <arg><option>--keyid</option></arg>
<arg choice="plain"><replaceable>tar_gz</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -85,29 +87,7 @@
</variablelist>
</refsect1>
<refsect1>
- <title>CONFIGURATION FILES</title>
- Three configuration files are parsed:
- <variablelist>
- <varlistentry>
- <term>/etc/git-buildpacakge/gbp.conf</term>
- </varlistentry>
- <varlistitem>- system wide configuraton</varlistitem>
- <varlistentry>
- <term>~/.gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per user configuration
- </varlistentry>
- <varlistentry>
- <term>\.git/gbp.conf</term>
- </varlistentry>
- <varlistentry>
- - per repository configuration
- </varlistentry>
- </variablelist>
- <para>
- See /etc/git-buildpacakge/gbp.conf for an example.
- </para>
+ &man.git.config-files;
</refsect1>
<refsect1>
<title>SEE ALSO</title>
diff --git a/docs/manpages/manpages.ent b/docs/manpages/manpages.ent
index d024c6a..43f2a24 100644
--- a/docs/manpages/manpages.ent
+++ b/docs/manpages/manpages.ent
@@ -1,3 +1,24 @@
<!ENTITY man.git.importorig SYSTEM "git-import-orig.sgml">
<!ENTITY man.git.importdsc SYSTEM "git-import-dsc.sgml">
<!ENTITY man.git.buildpackage SYSTEM "git-buildpackage.sgml">
+<!ENTITY man.git.config-files "
+ <title>CONFIGURATION FILES</title>
+ Three configuration files are parsed to set defaults for the above
+ commandline arguments:
+ <variablelist>
+ <varlistentry>
+ <term>/etc/git-buildpacakge/gbp.conf</term>
+ <listitem><para>system wide configuraton</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>~/.gbp.conf</term>
+ <listitem><para>per user configuration</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>.git/gbp.conf</term>
+ <listitem><para>per repository configuration</para></listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+ See /etc/git-buildpacakge/gbp.conf for an example.
+ </para>">