git/Documentation/technical, branch v2.3.8

Merge branch 'nd/split-index'

2014-12-22T20:28:11Z

A typofix to the documentation of a feature already in the release. * nd/split-index: index-format.txt: add a missing closing quote

Merge branch 'jk/credential-quit'

2014-12-22T20:27:20Z

Credential helpers are asked in turn until one of them give positive response, which is cumbersome to turn off when you need to run Git in an automated setting. The credential helper interface learned to allow a helper to say "stop, don't ask other helpers." Also GIT_TERMINAL_PROMPT environment can be set to false to disable our built-in prompt mechanism for passwords. * jk/credential-quit: prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts credential: let helpers tell us to quit

index-format.txt: add a missing closing quote

2014-12-11T22:24:37Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

credential: let helpers tell us to quit

2014-12-04T18:11:12Z

When we are trying to fill a credential, we loop over the set of defined credential-helpers, then fall back to running askpass, and then finally prompt on the terminal. Helpers which cannot find a credential are free to tell us nothing, but they cannot currently ask us to stop prompting. This patch lets them provide a "quit" attribute, which asks us to stop the process entirely (avoiding running more helpers, as well as the askpass/terminal prompt). This has a few possible uses: 1. A helper which prompts the user itself (e.g., in a dialog) can provide a "cancel" button to the user to stop further prompts. 2. Some helpers may know that prompting cannot possibly work. For example, if their role is to broker a ticket from an external auth system and that auth system cannot be contacted, there is no point in continuing (we need a ticket to authenticate, and the user cannot provide one by typing it in). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

sort_string_list(): rename to string_list_sort()

2014-11-25T18:11:34Z

The new name is more consistent with the names of other string_list-related functions. Suggested-by: Junio C Hamano Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

Documentation: typofixes

2014-11-04T21:14:44Z

In addition to fixing trivial and obvious typos, be careful about the following points: - Spell ASCII, URL and CRC in ALL CAPS; - Spell Linux as Capitalized; - Do not omit periods in "i.e." and "e.g.". Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Merge branch 'rs/child-process-init'

2014-10-31T18:49:49Z

* rs/child-process-init: api-run-command: add missing list item marker

api-run-command: add missing list item marker

2014-10-28T22:25:25Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

run-command: add env_array, an optional argv_array for env

2014-10-19T22:26:31Z

Similar to args, add a struct argv_array member to struct child_process that simplifies specifying the environment for children. It is freed automatically by finish_command() or if start_command() encounters an error. Suggested-by: Jeff King Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'mh/lockfile-stdio'

2014-10-14T17:49:52Z

* mh/lockfile-stdio: commit_packed_refs(): reimplement using fdopen_lock_file() dump_marks(): reimplement using fdopen_lock_file() fdopen_lock_file(): access a lockfile using stdio