Ouch. This one should *not* have been sent (the "[PATCH v2 6/6]" one is the correct one). Very sorry :(. I'll triple check next time. Max On 28.11.2012, at 00:03, Max Horn wrote: > The documentation was misleading in that it gave the impression that > 'for-push' could be used as a ref attribute in the output of the > 'list' command. That is wrong. > > Also, explicitly point out the connection between the commands > 'list' and 'options' on the one hand, and the sections > 'REF LIST ATTRIBUTES' and 'OPTIONS' on the other hand. > > Signed-off-by: Max Horn <max@xxxxxxxxx> > --- > Documentation/git-remote-helpers.txt | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt > index 023dcca..e1df01d 100644 > --- a/Documentation/git-remote-helpers.txt > +++ b/Documentation/git-remote-helpers.txt > @@ -227,6 +227,8 @@ Support for this command is mandatory. > the name; unrecognized attributes are ignored. The list ends > with a blank line. > + > +See REF LIST ATTRIBUTES for a list of currently defined options. > ++ > Supported if the helper has the "fetch" or "import" capability. > > 'list for-push':: > @@ -248,6 +250,8 @@ Supported if the helper has the "push" or "export" capability. > for it). Options should be set before other commands, > and may influence the behavior of those commands. > + > +See OPTIONS for a list of currently defined options. > ++ > Supported if the helper has the "option" capability. > > 'fetch' <sha1> <name>:: > @@ -256,7 +260,7 @@ Supported if the helper has the "option" capability. > per line, terminated with a blank line. > Outputs a single blank line when all fetch commands in the > same batch are complete. Only objects which were reported > - in the ref list with a sha1 may be fetched this way. > + in the output of 'list' with a sha1 may be fetched this way. > + > Optionally may output a 'lock <file>' line indicating a file under > GIT_DIR/objects/pack which is keeping a pack until refs can be > @@ -360,10 +364,9 @@ capabilities reported by the helper. > REF LIST ATTRIBUTES > ------------------- > > -'for-push':: > - The caller wants to use the ref list to prepare push > - commands. A helper might chose to acquire the ref list by > - opening a different type of connection to the destination. > +The 'list' command produces a list of refs in which each ref > +may be followed by a list of attributes. The following ref list > +attributes are defined. > > 'unchanged':: > This ref is unchanged since the last import or fetch, although > @@ -371,6 +374,10 @@ REF LIST ATTRIBUTES > > OPTIONS > ------- > + > +The following options are defined and (under suitable circumstances) > +set by git if the remote helper has the 'option' capability. > + > 'option verbosity' <n>:: > Changes the verbosity of messages displayed by the helper. > A value of 0 for <n> means that processes operate > -- > 1.8.0.393.gcc9701d > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html