[PATCH] Improve user-manual html and pdf formatting

2014-01-04 Thread Thomas Ackermann
Use asciidoc style 'article' instead of 'book' and change asciidoc title level. This removes blank first page and superfluous Part I page (there is no Part II) in pdf output. Also pdf size is decreased by this from 77 to 67 pages. In html output this removes unnecessary sub-tocs and chapter

Re: [PATCH] Improve user-manual html and pdf formatting

2014-01-04 Thread Øystein Walle
Jonathan Nieder jrnieder at gmail.com writes: Hi, Thomas Ackermann wrote: --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt at at -1,5 +1,5 at at -Git User Manual +#65279;Git User Manual Why? Puzzled, Jonathan That's a Unicode Byte Order

Re: [PATCH] Improve user-manual html and pdf formatting

2014-01-04 Thread Andreas Schwab
Øystein Walle oys...@gmail.com writes: Jonathan Nieder jrnieder at gmail.com writes: Hi, Thomas Ackermann wrote: --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt at at -1,5 +1,5 at at -Git User Manual +#65279;Git User Manual Why? Puzzled,

Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread Heiko Voigt
Hi, On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us The previous code only checked out the requested branch in cmd_add. This commit moves the branch-checkout logic into module_clone, where it can be shared by cmd_add and cmd_update. I

Re: [PATCH] Improve user-manual html and pdf formatting

2014-01-04 Thread Øystein Walle
Andreas Schwab schwab at linux-m68k.org writes: That's a Unicode Byte Order Mark. No, its an ampersand, a hash, a number and a semicolon. Definitely not a BOM. Andreas. You're right, of course :) I was a bit hasty. #65279; is a HTML entity (or at least something like looks like one)

Re: [PATCH] Documentation/gitmodules: Only 'update' and 'url' are required

2014-01-04 Thread Heiko Voigt
On Fri, Jan 03, 2014 at 10:31:22AM -0800, W. Trevor King wrote: From: W. Trevor King wk...@tremily.us Before this commit, all the settings fell under the initial Each submodule section also contains the following required keys:. The example shows sections with just 'update' and 'url'

Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread W. Trevor King
On Sat, Jan 04, 2014 at 11:09:15PM +0100, Heiko Voigt wrote: On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: @@ -306,7 +307,14 @@ module_clone() echo gitdir: $rel/$a $sm_path/.git rel=$(echo $a | sed -e 's|[^/][^/]*|..|g') - (clear_local_git_env; cd $sm_path

Re: [PATCH] Documentation/gitmodules: Only 'update' and 'url' are required

2014-01-04 Thread W. Trevor King
On Sat, Jan 04, 2014 at 11:17:54PM +0100, Heiko Voigt wrote: On Fri, Jan 03, 2014 at 10:31:22AM -0800, W. Trevor King wrote: Before this commit, all the settings fell under the initial Each submodule section also contains the following required keys:. The example shows sections with just

Re: Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread Heiko Voigt
On Sat, Jan 04, 2014 at 02:54:01PM -0800, W. Trevor King wrote: On Sat, Jan 04, 2014 at 11:09:15PM +0100, Heiko Voigt wrote: On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: @@ -306,7 +307,14 @@ module_clone() echo gitdir: $rel/$a $sm_path/.git rel=$(echo $a |

Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread W. Trevor King
On Sun, Jan 05, 2014 at 01:39:22AM +0100, Heiko Voigt wrote: On Sat, Jan 04, 2014 at 02:54:01PM -0800, W. Trevor King wrote: On Sat, Jan 04, 2014 at 11:09:15PM +0100, Heiko Voigt wrote: On Fri, Jan 03, 2014 at 10:06:11AM -0800, W. Trevor King wrote: @@ -861,7 +860,12 @@ Maybe you want to

Re: git fetch doesn't ignore funny refs

2014-01-04 Thread Heiko Voigt
On Tue, Dec 17, 2013 at 01:35:33PM +0100, Lorenzo Keller wrote: A check as this one: if (check_refname_format(ref-name, 0)) continue; fixes the problem for me. I report here bug and fix in the hope it can be reviewed and integrated in future git releases. Since it seems you already

[PATCH 2/2] Introduce git submodule attached update

2014-01-04 Thread Francesco Pretto
At the current state, the following use-case is not supported very well in git: - a maintainer adds a submodule, checking out a specific branch of the repository. He doesn't track the upstream submodule revision sha1; - a developer checkout the repository branch decided by the maintainer.

[PATCH 1/2] git-submodule.sh: Support 'checkout' as a valid update command

2014-01-04 Thread Francesco Pretto
According to Documentation/gitmodules.txt, 'checkout' is a valid 'submodule.name.update' command. Also git-submodule.sh refers to it and processes it correctly. Reflect commit 'ac1fbb' to support this syntax and also validates property values during 'update' command, issuing a warning if the value

Re: [PATCH] submodule: Respect reqested branch on all clones

2014-01-04 Thread Francesco Pretto
Thanks for adding your contribute. My comments below: 2014/1/3 W. Trevor King wk...@tremily.us: The previous code only checked out the requested branch in cmd_add. This commit moves the branch-checkout logic into module_clone, where it can be shared by cmd_add and cmd_update. I also update