rebase: give a better error message for bogus branch

diff --git a/git.spec.in b/git.spec.in
index 9533147ff2e06282dc8d60aeb371afa715e22cc1..91c8462b7dae171247c40db7f7b5b36d2c0633a1 100644 (file)
--- a/git.spec.in
+++ b/git.spec.in
@@ -35,6 +35,7 @@ Requires:     git-cvs = %{version}-%{release}
 Requires:      git-arch = %{version}-%{release}
 Requires:      git-email = %{version}-%{release}
 Requires:      gitk = %{version}-%{release}
+Requires:      gitweb = %{version}-%{release}
 Requires:      git-gui = %{version}-%{release}
 Obsoletes:     git <= 1.5.4.2
 
@@ -87,6 +88,13 @@ Requires:       git = %{version}-%{release}, tk >= 8.4
 %description -n gitk
 Git revision tree visualiser ('gitk')
 
+%package -n gitweb
+Summary:       Git web interface
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
+%description -n gitweb
+Browsing git repository on the web
+
 %package -n perl-Git
 Summary:        Perl interface to Git
 Group:          Development/Libraries
@@ -189,6 +197,10 @@ rm -rf $RPM_BUILD_ROOT
 %{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
 %{!?_without_docs: %doc Documentation/*gitk*.html }
 
+%files -n gitweb
+%defattr(-,root,root)
+%{_datadir}/gitweb
+
 %files -n perl-Git -f perl-files
 %defattr(-,root,root)
 
@@ -196,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Wed Jun 30 2010 Junio C Hamano <gitster@pobox.com>
+- Add 'gitweb' subpackage.
+
 * Fri Mar 26 2010 Ian Ward Comfort <icomfort@stanford.edu>
 - Ship bash completion support from contrib/ in the core package.