diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.11.5.txt | 28 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.12.txt | 17 | ||||
| -rw-r--r-- | Documentation/git-credential.txt | 2 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | command-list.txt | 1 | ||||
| -rw-r--r-- | compat/terminal.c | 1 |
7 files changed, 34 insertions, 20 deletions
diff --git a/Documentation/RelNotes/1.7.11.5.txt b/Documentation/RelNotes/1.7.11.5.txt new file mode 100644 index 000000000..86df992c6 --- /dev/null +++ b/Documentation/RelNotes/1.7.11.5.txt @@ -0,0 +1,28 @@ +Git v1.7.11.5 Release Notes +=========================== + +Fixes since v1.7.11.4 +--------------------- + + * The Makefile rule to create assembly output (primarily for + debugging purposes) did not create it next to the source. + + * On some architectures, "block-sha1" did not compile correctly + when compilers inferred alignment guarantees from our source we + did not intend to make. + + * When talking to a remote running ssh on IPv6 enabled host, whose + address is spelled as "[HOST]:PORT", we did not parse the address + correctly and failed to connect. + + * git-blame.el (in compat/) have been updated to use Elisp more + correctly. + + * "git checkout <branchname>" to come back from a detached HEAD state + incorrectly computed reachability of the detached HEAD, resulting + in unnecessary warnings. + + * "git mergetool" did not support --tool-help option to give the list + of supported backends, like "git difftool" does. + +Also contains minor typofixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.txt index 786a70242..fb7f761a3 100644 --- a/Documentation/RelNotes/1.7.12.txt +++ b/Documentation/RelNotes/1.7.12.txt @@ -51,10 +51,6 @@ UI, Workflows & Features read. The error message in this case was updated to give better hints to the user. - * git native protocol agents learned to show software version over - the wire, so that the server log can be examined to see the vintage - distribution of clients. - * "git help -w $cmd" can show HTML version of documentation for "git-$cmd" by setting help.htmlpath to somewhere other than the default location where the build procedure installs them locally; @@ -140,23 +136,10 @@ details). comparison. (merge cb2912c hv/link-alt-odb-entry later to maint). - * "git checkout <branchname>" to come back from a detached HEAD state - incorrectly computed reachability of the detached HEAD, resulting - in unnecessary warnings. - (merge add416a jk/maint-checkout-orphan-check-fix later to maint). - - * The documentation for revision range specifiers (e.g. A..B, A^@) - has been updated. - (merge ca5ee2d mh/maint-revisions-doc later to maint). - * "git submodule add" was confused when the superproject did not have its repository in its usual place in the working tree and GIT_DIR and GIT_WORK_TREE was used to access it. - * "git mergetool" did not support --tool-help option to give the list - of supported backends, like "git difftool" does. - (merge 109859e jc/mergetool-tool-help later to maint). - * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 53adee320..810e95712 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -3,7 +3,7 @@ git-credential(1) NAME ---- -git-credential - retrieve and store user credentials +git-credential - Retrieve and store user credentials SYNOPSIS -------- diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 4c1a79e3b..54c1fc86e 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.12-rc1 +DEF_VER=v1.7.12-rc2 LF=' ' @@ -1014,6 +1014,7 @@ ifeq ($(uname_S),SunOS) NO_REGEX = YesPlease NO_FNMATCH_CASEFOLD = YesPlease NO_MSGFMT_EXTENDED_OPTIONS = YesPlease + HAVE_DEV_TTY = YesPlease ifeq ($(uname_R),5.6) SOCKLEN_T = int NO_HSTRERROR = YesPlease @@ -2093,7 +2094,7 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak perl/perl.mak: perl/PM.stamp perl/PM.stamp: FORCE - $(QUIET_GEN)find perl -type f -name '*.pm' | sort >$@+ && \ + $(QUIET_GEN)$(FIND) perl -type f -name '*.pm' | sort >$@+ && \ { cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \ $(RM) $@+ diff --git a/command-list.txt b/command-list.txt index 14ea67af0..ec64cacf0 100644 --- a/command-list.txt +++ b/command-list.txt @@ -25,6 +25,7 @@ git-commit mainporcelain common git-commit-tree plumbingmanipulators git-config ancillarymanipulators git-count-objects ancillaryinterrogators +git-credential purehelpers git-cvsexportcommit foreignscminterface git-cvsimport foreignscminterface git-cvsserver foreignscminterface diff --git a/compat/terminal.c b/compat/terminal.c index 6d16c8fba..bbb038dd0 100644 --- a/compat/terminal.c +++ b/compat/terminal.c @@ -59,6 +59,7 @@ char *git_terminal_prompt(const char *prompt, int echo) r = strbuf_getline(&buf, fh, '\n'); if (!echo) { + fseek(fh, SEEK_CUR, 0); putc('\n', fh); fflush(fh); } |