global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-16 19:50:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Update draft release notes to 1.7.8
  Git 1.7.7.2
  name-hash.c: always initialize dir_next pointer
  svn: Quote repository root in regex match
  mingw: poll.h is no longer in sys/
  t7511: avoid use of reserved filename on Windows.
This commit is contained in:
Junio C Hamano
2011-11-01 16:45:25 -07:00
parent bcc18e3fb8 87bf9a7048
commit a028561976
6 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Documentation/RelNotes/1.7.7.2.txt Normal file
View File

@@ -0,0 +1,44 @@
Git v1.7.7.2 Release Notes
==========================
Fixes since v1.7.7.1
--------------------
* We used to drop error messages from libcurl on certain kinds of
errors.
* Error report from smart HTTP transport, when the connection was
broken in the middle of a transfer, showed a useless message on
a corrupt packet.
* "git fetch --prune" was unsafe when used with refspecs from the
command line.
* The attribute mechanism did not use case insensitive match when
core.ignorecase was set.
* "git bisect" did not notice when it failed to update the working tree
to the next commit to be tested.
* "git config --bool --get-regexp" failed to separate the variable name
and its value "true" when the variable is defined without "= true".
* "git remote rename $a $b" were not careful to match the remote name
against $a (i.e. source side of the remote nickname).
* "git mergetool" did not use its arguments as pathspec, but as a path to
the file that may not even have any conflict.
* "git diff --[num]stat" used to use the number of lines of context
different from the default, potentially giving different results from
"git diff | diffstat" and confusing the users.
* "git pull" and "git rebase" did not work well even when GIT_WORK_TREE is
set correctly with GIT_DIR if the current directory is outside the working
tree.
* "git send-email" did not honor the configured hostname when restarting
the HELO/EHLO exchange after switching TLS on.
* "gitweb" used to produce a non-working link while showing the contents
of a blob, when JavaScript actions are enabled.

66
Documentation/RelNotes/1.7.8.txt
View File

@@ -79,6 +79,9 @@ Updates since v1.7.7
* "git ls-remote" learned to respond to "-h"(elp) requests.
* "mediawiki" remote helper can interact with (surprise!) MediaWiki
with "git fetch" & "git push".
* "git merge" learned the "--edit" option to allow users to edit the
merge commit log message.
@@ -110,8 +113,8 @@ Updates since v1.7.7
between commits in the superproject that has and does not have the
submodule in the tree without re-cloning.
* "mediawiki" remote helper can interact with (surprise!) MediaWiki
with "git fetch" & "git push".
* "git upload-archive" (hence "git archive --remote") can be built
and used on mingw port of Git.
* "gitweb" leaked unescaped control characters from syntax hiliter
outputs.
@@ -131,15 +134,6 @@ Fixes since v1.7.7
Unless otherwise noted, all fixes in the 1.7.7.X maintenance track are
included in this release.
* We used to drop error messages from libcurl on certain kinds of
errors.
(merge be22d92eac8 jn/maint-http-error-message later to maint).
* Error report from smart HTTP transport, when the connection was
broken in the middle of a transfer, showed a useless message on
a corrupt packet.
(merge 6cdf022 sp/smart-http-failure later to maint).
* HTTP transport did not use pushurl correctly, and also did not tell
what host it is trying to authenticate with when asking for
credentials.
@@ -156,65 +150,27 @@ included in this release.
with too many refs were unnecessarily slow.
(merge 17d68a54d jp/get-ref-dir-unsorted later to maint).
* "git fetch --prune" was unsafe when used with refspecs from the
command line.
(merge e8c1e6c cn/fetch-prune later to maint).
* Report from "git commit" on untracked files was confused under
core.ignorecase option.
(merge 2548183b jk/name-hash-dirent later to maint).
* The attribute mechanism did not use case insensitive match when
core.ignorecase was set.
(merge 6eba621 bc/attr-ignore-case later to maint).
* "git bisect" did not notice when it failed to update the working tree
to the next commit to be tested.
(merge 1acf11717 js/bisect-no-checkout later to maint).
* "git config --bool --get-regexp" failed to separate the variable name
and its value "true" when the variable is defined without "= true".
(merge 880e3cc mm/maint-config-explicit-bool-display later to maint).
* "git remote rename $a $b" were not careful to match the remote name
against $a (i.e. source side of the remote nickname).
(merge b52d00aed mz/remote-rename later to maint).
* "git diff --[num]stat" used to use the number of lines of context
different from the default, potentially giving different results from
"git diff | diffstat" and confusing the users.
(merge f01cae918 jc/maint-diffstat-numstat-context later to maint).
(merge 395c7356 jk/name-hash-dirent later to maint).
* "git merge" did not understand ":/<pattern>" as a way to name a commit.
* "git mergetool" learned to use its arguments as pathspec, not a path to
the file that may not even have any conflict.
(merge 6d9990a jm/mergetool-pathspec later to maint).
* "git pull" and "git rebase" did not work well even when GIT_WORK_TREE is
set correctly with GIT_DIR if the current directory is outside the working
tree.
(merge 035b5bf jk/pull-rebase-with-work-tree later to maint).
" "git push" on the receiving end used to call post-receive and post-update
hooks for attempted removal of non-existing refs.
(merge 160b81ed ph/push-to-delete-nothing later to maint).
* "git send-email" did not honor the configured hostname when restarting
the HELO/EHLO exchange after switching TLS on.
(merge 155b940 md/smtp-tls-hello-again later to maint).
* "gitweb" used to produce a non-working link while showing the contents
of a blob, when JavaScript actions are enabled.
(merge 2b07ff3ff ps/gitweb-js-with-lineno later to maint).
* The logic to filter out forked projects in the project list in
"gitweb" was broken for some time.
(merge 53c632f jm/maint-gitweb-filter-forks-fix later to maint).
* The logic to optimize the locality of the data in a pack introduced in
1.7.7 was grossly inefficient.
(merge 38d4deb dm/pack-objects-update later to maint).
---
exec >/var/tmp/1
O=v1.7.7.1-492-g324bc2a
O=v1.7.8-rc0-32-g8e3565f
echo O=$(git describe --always master)
git log --first-parent --oneline --reverse ^$O master
echo

2
Makefile
View File

@@ -515,7 +515,7 @@ LIB_H += compat/mingw.h
LIB_H += compat/obstack.h
LIB_H += compat/win32/pthread.h
LIB_H += compat/win32/syslog.h
LIB_H += compat/win32/sys/poll.h
LIB_H += compat/win32/poll.h
LIB_H += compat/win32/dirent.h
LIB_H += connected.h
LIB_H += csum-file.h

4
git-svn.perl
View File

@@ -684,7 +684,7 @@ sub populate_merge_info {
fatal "merge commit $d has ancestor $parent, but that change "
."does not have git-svn metadata!";
}
unless ($branchurl =~ /^$rooturl(.*)/) {
unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
fatal "commit $parent git-svn metadata changed mid-run!";
}
my $branchpath = $1;
@@ -867,7 +867,7 @@ sub cmd_dcommit {
."has uuid $uuid!";
}
unless ($branchurl =~ /^$rooturl(.*)/) {
unless ($branchurl =~ /^\Q$rooturl\E(.*)/) {
# This branch is very strange indeed.
fatal "merge parent $parent for $d is on branch "
."$branchurl, which is not under the "

2
name-hash.c
View File

@@ -74,7 +74,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
if (ce->ce_flags & CE_HASHED)
return;
ce->ce_flags |= CE_HASHED;
ce->next = NULL;
ce->next = ce->dir_next = NULL;
hash = hash_name(ce->name, ce_namelen(ce));
pos = insert_hash(hash, ce, &istate->name_hash);
if (pos) {

2
t/t7511-status-index.sh
View File

@@ -24,7 +24,7 @@ check() {
check 1
check 2 p
check 3 pr
check 3 px
check 4 pre
check 5 pref
check 6 prefi