Commits

Show all
Author Commit Message Labels Comments Date
Max Horn
git-remote-helpers.txt: rearrange description of capabilities This also remove some duplication in the descriptions (e.g. refspec was explained twice with similar level of detail). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Max Horn
git-remote-helpers.txt: minor grammar fix Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Max Horn
git-remote-helpers.txt: document missing capabilities Specifically, document the 'export' and '(im|ex)port-marks' capabilities as well as the export command, which were undocumented (but in active use). Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Max Horn
git-remote-helpers.txt: document invocation before input format In the distant past, the order things were documented was 'Invocation', 'Commands', 'Capabilities', ... Then it was decided that before giving a list of Commands, there should be an overall description of the 'Input format', which was a wise decision. However, this description was put as the very first thing, with the rationale that any implementor would want to know that first. However, it seem…
Junio C Hamano
Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages l10n: Update Swedish translation (1979t0f0u) l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 l10n: Update git.pot (5 new, 1 removed messages)
Junio C Hamano
Merge branch 'rr/t4041-cleanup' * rr/t4041-cleanup: t4041 (diff-submodule-option): modernize style t4041 (diff-submodule-option): rewrite add_file() routine t4041 (diff-submodule-option): parse digests sensibly t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputs
Jiang Xin
Merge branch git://github.com/ralfth/git-po-de * 'rt/de-l10n-updates-for-1.8.1' of git://github.com/ralfth/git-po-de: l10n: de.po: translate 22 new messages l10n: de.po: translate 825 new messages Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Ralf Thielow
l10n: de.po: translate 22 new messages Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Michael J Gruber <git@drmicha.warpmail.net>
Ralf Thielow
l10n: de.po: translate 825 new messages Translate 825 new messages came from git.pot update in cc76011 ("l10n: Update git.pot (825 new, 24 removed messages)"). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Thomas Rast <trast@student.ethz.ch> Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
Junio C Hamano
Merge branch 'mm/status-push-pull-advise' * mm/status-push-pull-advise: document that statusHints affects git checkout
Erik Faye-Lund
mingw: get rid of getpass implementation There's no remaining call-sites, and as pointed out in the previous commit message, it's not quite ideal. So let's just lose it. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund
mingw: reuse tty-version of git_terminal_prompt The getpass-implementation we use on Windows isn't at all ideal; it works in raw-mode (as opposed to cooked mode), and as a result does not deal correcly with deletion, arrow-keys etc. Instead, use cooked mode to read a line at the time, allowing the C run-time to process the input properly. Since we set files to be opened in binary-mode by default on Windows, introduce a FORCE_TEXT macro that e…
Erik Faye-Lund
compat/terminal: separate input and output handles On Windows, the terminal cannot be opened in read-write mode, so we need distinct pairs for reading and writing. Since this works fine on other platforms as well, always open them in pairs. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund
compat/terminal: factor out echo-disabling By moving the echo-disabling code to a separate function, we can implement OS-specific versions of it for non-POSIX platforms. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund
mingw: make fgetc raise SIGINT if apropriate Set a control-handler to prevent the process from terminating, and simulate SIGINT so it can be handled by a signal-handler as usual. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund
mingw: correct exit-code for SIGALRM's SIG_DFL Make sure SIG_DFL for SIGALRM exits with 128 + SIGALRM so other processes can diagnose why it exits. While we're at it, make sure we only write to stderr if it's a terminal, and change the output to match that of Linux. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy
document that statusHints affects git checkout Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.8.1-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.8.1-rc0
Junio C Hamano
Merge branch 'mm/status-push-pull-advise' Finishing touch to allow the new advice message squelched with an advice.* configuration variable. * mm/status-push-pull-advise: status: respect advice.statusHints for ahead/behind advice
Jeff King
status: respect advice.statusHints for ahead/behind advice If the user has unset advice.statusHints, we already suppress the "use git reset to..." hints in each stanza. The new "use git push to publish..." hint is the same type of hint. Let's respect statusHints for it, rather than making the user set yet another advice flag. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gits…
Ramkumar Ramachandra
t4041 (diff-submodule-option): modernize style - Enclose tests in single quotes as opposed to double quotes. This is the prevalent style in other tests. - Remove the unused variable $head4_full. - Indent the expected output so that it lines up with the rest of the test text. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra
t4041 (diff-submodule-option): rewrite add_file() routine Instead of "cd there and then come back", use the "cd there in a subshell" pattern. Also fix '&&' chaining in one place. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra
t4041 (diff-submodule-option): parse digests sensibly `git rev-list --max-count=1 HEAD` is a roundabout way of saying `git rev-parse --verify HEAD`; replace a bunch of instances of the former with the latter. Also, don't unnecessarily `cut -c1-7` the rev-parse output when the `--short` option is available. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Peter Krefting
l10n: Update Swedish translation (1979t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Tran Ngoc Quan
l10n: vi.po: update to git-v1.8.0.1-347-gf94c3 * updated all new messages (1979t0f0u) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Jiang Xin
l10n: Update git.pot (5 new, 1 removed messages) L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Junio C Hamano
Update draft release notes to 1.8.1
Junio C Hamano
Merge branch 'pw/p4-various-fixes' * pw/p4-various-fixes: git p4: remove unneeded cmd initialization git p4: fix labelDetails typo in exception git p4 test: display unresolvable host error git p4: catch p4 errors when streaming file contents git p4: handle servers without move support git p4: catch p4 describe errors
Junio C Hamano
Merge branch 'lt/diff-stat-show-0-lines' "git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total coun…
Junio C Hamano
Merge branch 'fc/remote-hg' New remote helper for hg. * fc/remote-hg: (22 commits) remote-hg: fix for older versions of python remote-hg: fix for files with spaces remote-hg: avoid bad refs remote-hg: try the 'tip' if no checkout present remote-hg: fix compatibility with older versions of hg remote-hg: add missing config for basic tests remote-hg: the author email can be null remote-hg: add option to not tra…
  1. Prev
  2. Next