user/sven/git.git/git.c, branch v1.7.3.5

Use angles for placeholders consistently

2010-10-08T19:29:52Z

Signed-off-by: Štěpán Němec Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'tf/cleanup-builtin-help-headers'

2010-09-08T16:17:01Z

* tf/cleanup-builtin-help-headers: builtin.h: Move two functions definitions to help.h.

Merge branch 'kf/askpass-config'

2010-09-08T16:17:01Z

* kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'.

Merge branch 'jk/maint-pass-c-config-in-env'

2010-09-08T16:17:00Z

* jk/maint-pass-c-config-in-env: do not pass "git -c foo=bar" params to transport helpers pass "git -c foo=bar" params through environment

builtin.h: Move two functions definitions to help.h.

2010-09-01T15:00:51Z

The two functions defined here are implemented in help.c, so makes more sense to put the definition of those in help.h instead of in builtin.h. Signed-off-by: Thiago Farina Signed-off-by: Junio C Hamano

Merge branch 'jn/paginate-fix'

2010-08-31T23:23:31Z

* jn/paginate-fix: t7006 (pager): add missing TTY prerequisites merge-file: run setup_git_directory_gently() sooner var: run setup_git_directory_gently() sooner ls-remote: run setup_git_directory_gently() sooner index-pack: run setup_git_directory_gently() sooner config: run setup_git_directory_gently() sooner bundle: run setup_git_directory_gently() sooner apply: run setup_git_directory_gently() sooner grep: run setup_git_directory_gently() sooner shortlog: run setup_git_directory_gently() sooner git wrapper: allow setup_git_directory_gently() be called earlier setup: remember whether repository was found git wrapper: introduce startup_info struct Conflicts: builtin/index-pack.c

Allow core.askpass to override SSH_ASKPASS.

2010-08-31T17:49:17Z

Modify handling of the 'core.askpass' option so that it has the same effect as GIT_ASKPASS also if SSH_ASKPASS is set. Signed-off-by: Knut Franke Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-08-26T23:42:59Z

* maint: for-each-ref: fix objectname:short bug tree-walk: Correct bitrotted comment about tree_entry() Fix 'git log' early pager startup error case

Fix 'git log' early pager startup error case

2010-08-25T19:11:59Z

We start the pager too early for several git commands, which results in the errors sometimes going to the pager rather than show up as errors. This is often hidden by the fact that we pass in '-X' to less by default, which causes 'less' to exit for small output, but if you do export LESS=-S you can then clearly see the problem by doing git log --prretty which shows the error message ("fatal: unrecognized argument: --prretty") being sent to the pager. This happens for pretty much all git commands that use USE_PAGER, and then check arguments separately. But "git diff" does it too early too (even though it does an explicit setup_pager() call) This only fixes it for the trivial "git log" family case. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

pass "git -c foo=bar" params through environment

2010-08-24T16:53:46Z

Git uses the "-c foo=bar" parameters to set a config variable for a single git invocation. We currently do this by making a list in the current process and consulting that list in git_config. This works fine for built-ins, but the config changes are silently ignored by subprocesses, including dashed externals and invocations to "git config" from shell scripts. This patch instead puts them in an environment variable which we consult when looking at config (both internally and via calls "git config"). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano