lp:~jelmer/git/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7885. By Ramsay Jones <email address hidden> on 2009-03-11

git-instaweb: fix lighttpd configuration on cygwin

Signed-off-by: Ramsay Jones <email address hidden>
Tested-by: Pascal Obry <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7884. By Daniel Barkalow <email address hidden> on 2009-03-11

Include log_config module in apache.conf

The log_config module is needed for at least some versions of apache to
support the LogFormat directive.

Signed-off-by: Daniel Barkalow <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7883. By Michael J Gruber <email address hidden> on 2009-03-11

Typo and language fixes for git-checkout.txt

Signed-off-by: Michael J Gruber <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7882. By Erik Faye-Lund on 2009-03-11

connect.c: remove a few globals by using git_config callback data

Since ef90d6d (Provide git_config with a callback-data parameter,
2008-05-14), git_config() takes a callback data pointer that can be
used to pass extra parameters to the parsing function. The codepath
to parse configuration variables related to git proxy predates this
facility and used a pair of file scope static variables instead.

This patch removes the need for these global variables by passing the
name of the host we are trying to access as the callback data.

Signed-off-by: Erik Faye-Lund <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7881. By Junio C Hamano <email address hidden> on 2009-03-10

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: support intermediate paths when matching tags/branches

7880. By René Scharfe <email address hidden> on 2009-03-09

parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together

As suggested by Junio, disallow the flags PARSE_OPT_KEEP_UNKNOWN and
PARSE_OPT_STOP_AT_NON_OPTION to be turned on at the same time, as a
value of an unknown option could be mistakenly classified as a
non-option, stopping the parser early. E.g.:

 git cmd --known --unknown value arg0 arg1

The parser should have stopped at "arg0", but it already stops at
"value".

This patch makes parse_options() die if the two flags are used in
combination.

Signed-off-by: Rene Scharfe <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7879. By René Scharfe <email address hidden> on 2009-03-09

parseopt: document KEEP_ARGV0, KEEP_UNKNOWN, NO_INTERNAL_HELP

Signed-off-by: Rene Scharfe <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7878. By René Scharfe <email address hidden> on 2009-03-08

archive: use parseopt for local-only options

Replace the hand-rolled parsers that find and remove --remote and --exec
by a parseopt parser that also handles --output.

All three options only have a meaning if no remote server is used or on
the local side. They must be rejected by upload-archive and should not
be sent to the server by archive.

We can't use a single parser for both remote and local side because the
remote end possibly understands a different set of options than the
local side. A local parser would then wrongly accuse options valid on
the other side as being incorrect.

This patch implements a very forgiving parser that understands only the
three options mentioned above. All others are passed to the normal,
complete parser in archive.c (running either locally in archive, or
remotely in upload-archive). This normal parser definition contains
dummy entries for the three options, in order for them to appear in the
help screen.

The parseopt parser allows multiple occurrences of --remote and --exec
unlike the previous one; the one specified last wins. This looseness
is acceptable, I think.

Signed-off-by: Rene Scharfe <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7877. By René Scharfe <email address hidden> on 2009-03-08

parseopt: make usage optional

Allow usagestr to be NULL and don't display any help screen in
this case. This is useful to implement incremental parsers.

Signed-off-by: Rene Scharfe <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

7876. By René Scharfe <email address hidden> on 2009-03-08

parseopt: add PARSE_OPT_NO_INTERNAL_HELP

Add a parseopt flag, PARSE_OPT_NO_INTERNAL_HELP, that turns off internal
handling of -h, --help and --help-all. This allows the implementation
of custom help option handlers or incremental parsers.

Signed-off-by: Rene Scharfe <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>