* Compile fails on OSX 10.9 with FSF GCC in common crypto
@ 2014-10-03 10:41 2% Volker Braun
0 siblings, 0 replies; 6+ results
From: Volker Braun @ 2014-10-03 10:41 UTC (permalink / raw)
To: git
* Works with Apple clang
* Works with FSF GCC and NO_APPLE_COMMON_CRYPTO=yes.
* Fails with FSF GCC, see below
* FWIW, git-1.8.4.4 can be compiled with FSF GCC
$ gcc --version
gcc (GCC) 4.7.3
Copyright (C) 2012 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ ./configure
configure: Setting lib to 'lib' (the default)
configure: Will try -pthread then -lpthread to enable POSIX Threads.
configure: CHECKS for site configuration
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking how to run the C preprocessor... cpp
checking for grep that handles long lines and -e... /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for size_t... yes
checking for working alloca.h... yes
checking for alloca... yes
configure: CHECKS for programs
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking for inline... inline
checking if linker supports -R... no
checking if linker supports -Wl,-rpath,... yes
checking for gtar... no
checking for tar... tar
checking for gnudiff... no
checking for gdiff... no
checking for diff... diff
checking for asciidoc... no
configure: CHECKS for libraries
checking for SHA1_Init in -lcrypto... yes
checking for curl_global_init in -lcurl... yes
checking for XML_ParserCreate in -lexpat... yes
checking for iconv in -lc... no
checking for iconv in -liconv... yes
checking for deflateBound in -lz... yes
checking for socket in -lc... yes
checking for inet_ntop... yes
checking for inet_pton... yes
checking for hstrerror... yes
checking for basename in -lc... yes
checking for gettext in -lc... no
checking libintl.h usability... no
checking libintl.h presence... no
checking for libintl.h... no
configure: CHECKS for header files
checking sys/select.h usability... yes
checking sys/select.h presence... yes
checking for sys/select.h... yes
checking sys/poll.h usability... yes
checking sys/poll.h presence... yes
checking for sys/poll.h... yes
checking for inttypes.h... (cached) yes
checking for old iconv()... no
configure: CHECKS for typedefs, structures, and compiler characteristics
checking for socklen_t... yes
checking for struct dirent.d_ino... yes
checking for struct dirent.d_type... yes
checking for struct passwd.pw_gecos... yes
checking for struct sockaddr_storage... yes
checking for struct addrinfo... yes
checking for getaddrinfo... yes
checking for library containing getaddrinfo... none required
checking whether the platform regex can handle null bytes... yes
checking whether system succeeds to read fopen'ed directory... no
checking whether snprintf() and/or vsnprintf() return bogus value... no
configure: CHECKS for library functions
checking libgen.h usability... yes
checking libgen.h presence... yes
checking for libgen.h... yes
checking paths.h usability... yes
checking paths.h presence... yes
checking for paths.h... yes
checking libcharset.h usability... yes
checking libcharset.h presence... yes
checking for libcharset.h... yes
checking for strings.h... (cached) yes
checking for locale_charset in -liconv... yes
checking for strcasestr... yes
checking for library containing strcasestr... none required
checking for memmem... yes
checking for library containing memmem... none required
checking for strlcpy... yes
checking for library containing strlcpy... none required
checking for uintmax_t... yes
checking for strtoumax... yes
checking for library containing strtoumax... none required
checking for setenv... yes
checking for library containing setenv... none required
checking for unsetenv... yes
checking for library containing unsetenv... none required
checking for mkdtemp... yes
checking for library containing mkdtemp... none required
checking for mkstemps... yes
checking for library containing mkstemps... none required
checking for initgroups... yes
checking for library containing initgroups... none required
checking for POSIX Threads with ''... yes
configure: creating ./config.status
config.status: creating config.mak.autogen
config.status: executing config.mak.autogen commands
$ make
GIT_VERSION = 2.1.2
* new build flags
CC credential-store.o
In file included from git-compat-util.h:324:0,
from cache.h:4,
from credential-store.c:1:
compat/apple-common-crypto.h: In function 'git_CC_EVP_EncodeBlock':
compat/apple-common-crypto.h:32:2: error: unknown type name
'SecTransformRef'
compat/apple-common-crypto.h:36:37: error: 'kSecBase64Encoding' undeclared
(first use in this
function)
compat/apple-common-crypto.h:36:37: note: each undeclared identifier is
reported only once for each
function it appears in
compat/apple-common-crypto.h:40:36: error: 'kSecTransformInputAttributeName'
undeclared (first use in
this function)
compat/apple-common-crypto.h:44:9: warning: assignment makes pointer from
integer without a cast
[enabled by default]
compat/apple-common-crypto.h:52:2: warning: passing argument 1 of
'CFRelease' makes pointer from
integer without a cast [enabled by default]
In file included from
/System/Library/Frameworks/Security.framework/Headers/SecAsn1Types.h:42:0,
from
/System/Library/Frameworks/Security.framework/Headers/oidsalg.h:29,
from
/System/Library/Frameworks/Security.framework/Headers/Security.h:44,
from compat/apple-common-crypto.h:14,
from git-compat-util.h:324,
from cache.h:4,
from credential-store.c:1:
/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:535:6:
note: expected 'CFTypeRef'
but argument is of type 'int'
In file included from git-compat-util.h:324:0,
from cache.h:4,
from credential-store.c:1:
compat/apple-common-crypto.h: In function 'git_CC_EVP_DecodeBlock':
compat/apple-common-crypto.h:62:2: error: unknown type name
'SecTransformRef'
compat/apple-common-crypto.h:66:37: error: 'kSecBase64Encoding' undeclared
(first use in this
function)
compat/apple-common-crypto.h:70:36: error: 'kSecTransformInputAttributeName'
undeclared (first use in
this function)
compat/apple-common-crypto.h:74:9: warning: assignment makes pointer from
integer without a cast
[enabled by default]
compat/apple-common-crypto.h:82:2: warning: passing argument 1 of
'CFRelease' makes pointer from
integer without a cast [enabled by default]
In file included from
/System/Library/Frameworks/Security.framework/Headers/SecAsn1Types.h:42:0,
from
/System/Library/Frameworks/Security.framework/Headers/oidsalg.h:29,
from
/System/Library/Frameworks/Security.framework/Headers/Security.h:44,
from compat/apple-common-crypto.h:14,
from git-compat-util.h:324,
from cache.h:4,
from credential-store.c:1:
/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:535:6:
note: expected 'CFTypeRef'
but argument is of type 'int'
make: *** [credential-store.o] Error 1
^ permalink raw reply [relevance 2%]
* Re: Re* manpage for git-pull mentions a non-valid option -m in a comment
2014-01-14 18:26 0% ` Re* " Junio C Hamano
@ 2014-01-14 18:51 0% ` Torsten Bögershausen
0 siblings, 0 replies; 6+ results
From: Torsten Bögershausen @ 2014-01-14 18:51 UTC (permalink / raw)
To: Junio C Hamano, Ivan Zakharyaschev; +Cc: git
On 2014-01-14 19.26, Junio C Hamano wrote:
> Ivan Zakharyaschev <imz@altlinux.org> writes:
>
>> Hello!
>>
>> git-1.8.4.4
>>
>> The manpage for git-pull mentions -m in a comment:
>>
>> --edit, -e, --no-edit
>> Invoke an editor before committing successful mechanical merge to further edit
>> the auto-generated merge message, so that the user can explain and justify the
>> merge. The --no-edit option can be used to accept the auto-generated message
>> (this is generally discouraged). The --edit (or -e) option is still useful if
>> you are giving a draft message with the -m option from the command line and
>> want to edit it in the editor.
>>
>> but it is not accepted actually:
>
> I do not think "git pull" ever had the "-m <message>" option; what
> you are seeing probably is a fallout from attempting to share the
> documentation pieces between "git pull" and "git merge" too
> agressively without proofreading.
>
> It seems that there are two issues; here is an untested attempt to
> fix.
>
> -- >8 --
> Subject: Documentaiotn: exclude irrelevant options from "git pull"
^^^^^^^^^^^^^^
(Small nit ??)
^ permalink raw reply [relevance 0%]
* Re* manpage for git-pull mentions a non-valid option -m in a comment
2014-01-14 2:09 4% BUG: manpage for git-pull mentions a non-valid option -m in a comment Ivan Zakharyaschev
@ 2014-01-14 18:26 0% ` Junio C Hamano
2014-01-14 18:51 0% ` Torsten Bögershausen
0 siblings, 1 reply; 6+ results
From: Junio C Hamano @ 2014-01-14 18:26 UTC (permalink / raw)
To: Ivan Zakharyaschev; +Cc: git
Ivan Zakharyaschev <imz@altlinux.org> writes:
> Hello!
>
> git-1.8.4.4
>
> The manpage for git-pull mentions -m in a comment:
>
> --edit, -e, --no-edit
> Invoke an editor before committing successful mechanical merge to further edit
> the auto-generated merge message, so that the user can explain and justify the
> merge. The --no-edit option can be used to accept the auto-generated message
> (this is generally discouraged). The --edit (or -e) option is still useful if
> you are giving a draft message with the -m option from the command line and
> want to edit it in the editor.
>
> but it is not accepted actually:
I do not think "git pull" ever had the "-m <message>" option; what
you are seeing probably is a fallout from attempting to share the
documentation pieces between "git pull" and "git merge" too
agressively without proofreading.
It seems that there are two issues; here is an untested attempt to
fix.
-- >8 --
Subject: Documentaiotn: exclude irrelevant options from "git pull"
10eb64f5 (git pull manpage: don't include -n from fetch-options.txt,
2008-01-25) introduced a way to exclude some parts of included
source when building git-pull documentation, and later 409b8d82
(Documentation/git-pull: put verbosity options before merge/fetch
ones, 2010-02-24) attempted to use the mechanism to exclude some
parts of merge-options.txt when used from git-pull.txt.
However, the latter did not have an intended effect, because the
macro "git-pull" used to decide if the source is included in
git-pull documentation were defined a bit too late.
Define the macro before it is used to fix this.
Even though "--[no-]edit" can be used with "git pull", the
explanation of the interaction between this option and the "-m"
option does not make sense within the context of "git pull". Use
the same conditional inclusion mechanism to remove this part from
"git pull" documentation, while keeping it for "git merge".
Reported-by: Ivan Zakharyaschev
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-pull.txt | 4 ++--
Documentation/merge-options.txt | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 6083aab..200eb22 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -99,10 +99,10 @@ must be given before the options meant for 'git fetch'.
Options related to merging
~~~~~~~~~~~~~~~~~~~~~~~~~~
-include::merge-options.txt[]
-
:git-pull: 1
+include::merge-options.txt[]
+
-r::
--rebase[=false|true|preserve]::
When true, rebase the current branch on top of the upstream
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index afba8d4..e134315 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -14,9 +14,12 @@ inspect and further tweak the merge result before committing.
further edit the auto-generated merge message, so that the user
can explain and justify the merge. The `--no-edit` option can be
used to accept the auto-generated message (this is generally
- discouraged). The `--edit` (or `-e`) option is still useful if you are
- giving a draft message with the `-m` option from the command line
- and want to edit it in the editor.
+ discouraged).
+ifndef::git-pull[]
+The `--edit` (or `-e`) option is still useful if you are
+giving a draft message with the `-m` option from the command line
+and want to edit it in the editor.
+endif::git-pull[]
+
Older scripts may depend on the historical behaviour of not allowing the
user to edit the merge log message. They will see an editor opened when
^ permalink raw reply related [relevance 0%]
* BUG: manpage for git-pull mentions a non-valid option -m in a comment
@ 2014-01-14 2:09 4% Ivan Zakharyaschev
2014-01-14 18:26 0% ` Re* " Junio C Hamano
0 siblings, 1 reply; 6+ results
From: Ivan Zakharyaschev @ 2014-01-14 2:09 UTC (permalink / raw)
To: git
Hello!
git-1.8.4.4
The manpage for git-pull mentions -m in a comment:
--edit, -e, --no-edit
Invoke an editor before committing successful mechanical merge to further edit
the auto-generated merge message, so that the user can explain and justify the
merge. The --no-edit option can be used to accept the auto-generated message
(this is generally discouraged). The --edit (or -e) option is still useful if
you are giving a draft message with the -m option from the command line and
want to edit it in the editor.
but it is not accepted actually:
git pull --no-edit -m 'Restoring config etc from server' \
origin server/GITCONFIG/master
fatal: No such remote or remote group: Restoring config etc from server
I'm not sure whether it is a bug of the implementation or of the documentation.
(I've also written down this issue at
https://bugzilla.altlinux.org/show_bug.cgi?id=29718 .)
Best regards,
Ivan
^ permalink raw reply [relevance 4%]
* [ANNOUNCE] Git v1.8.5-rc3
@ 2013-11-20 22:10 1% Junio C Hamano
0 siblings, 0 replies; 6+ results
From: Junio C Hamano @ 2013-11-20 22:10 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
A release candidate Git v1.8.5-rc3 is now available for testing
at the usual places.
Regression in the previous rc's on "git blame --literal-pathspecs"
etc. has been fixed.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
df1dc514640dd38d5c98f8c7f5bb674e2abec74e git-1.8.5.rc3.tar.gz
43ff8c2c7831a01633b10ae5a7aba6d620e13ab0 git-htmldocs-1.8.5.rc3.tar.gz
f155021b30ffb2a0be10d86806f5a8b92cc3c3e7 git-manpages-1.8.5.rc3.tar.gz
The following public repositories all have a copy of the v1.8.5-rc3
tag and the master branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Git v1.8.5 Release Notes (draft)
========================
Backward compatibility notes (for Git 2.0)
------------------------------------------
When "git push [$there]" does not say what to push, we have used the
traditional "matching" semantics so far (all your branches were sent
to the remote as long as there already are branches of the same name
over there). In Git 2.0, the default will change to the "simple"
semantics, which pushes:
- only the current branch to the branch with the same name, and only
when the current branch is set to integrate with that remote
branch, if you are pushing to the same remote as you fetch from; or
- only the current branch to the branch with the same name, if you
are pushing to a remote that is not where you usually fetch from.
Use the user preference configuration variable "push.default" to
change this. If you are an old-timer who is used to the "matching"
semantics, you can set the variable to "matching" to keep the
traditional behaviour. If you want to live in the future early, you
can set it to "simple" today without waiting for Git 2.0.
When "git add -u" (and "git add -A") is run inside a subdirectory and
does not specify which paths to add on the command line, it
will operate on the entire tree in Git 2.0 for consistency
with "git commit -a" and other commands. There will be no
mechanism to make plain "git add -u" behave like "git add -u .".
Current users of "git add -u" (without a pathspec) should start
training their fingers to explicitly say "git add -u ."
before Git 2.0 comes. A warning is issued when these commands are
run without a pathspec and when you have local changes outside the
current directory, because the behaviour in Git 2.0 will be different
from today's version in such a situation.
In Git 2.0, "git add <path>" will behave as "git add -A <path>", so
that "git add dir/" will notice paths you removed from the directory
and record the removal. Versions before Git 2.0, including this
release, will keep ignoring removals, but the users who rely on this
behaviour are encouraged to start using "git add --ignore-removal <path>"
now before 2.0 is released.
The default prefix for "git svn" will change in Git 2.0. For a long
time, "git svn" created its remote-tracking branches directly under
refs/remotes, but it will place them under refs/remotes/origin/ unless
it is told otherwise with its --prefix option.
Updates since v1.8.4
--------------------
Foreign interfaces, subsystems and ports.
* "git-svn" has been taught to use the serf library, which is the
only option SVN 1.8.0 offers us when talking the HTTP protocol.
* "git-svn" talking over an https:// connection using the serf library
dumped core due to a bug in the serf library that SVN uses. Work
around it on our side, even though the SVN side is being fixed.
* On MacOS X, we detected if the filesystem needs the "pre-composed
unicode strings" workaround, but did not automatically enable it.
Now we do.
* remote-hg remote helper misbehaved when interacting with a local Hg
repository relative to the home directory, e.g. "clone hg::~/there".
* imap-send ported to OS X uses Apple's security framework instead of
OpenSSL's.
* "git fast-import" treats an empty path given to "ls" as the root of
the tree.
UI, Workflows & Features
* xdg-open can be used as a browser backend for "git web-browse"
(hence to show "git help -w" output), when available.
* "git grep" and "git show" pay attention to the "--textconv" option
when these commands are told to operate on blob objects (e.g. "git
grep -e pattern --textconv HEAD:Makefile").
* "git replace" helper no longer allows an object to be replaced with
another object of a different type to avoid confusion (you can
still manually craft such a replacement using "git update-ref", as an
escape hatch).
* "git status" no longer prints the dirty status information of
submodules for which submodule.$name.ignore is set to "all".
* "git rebase -i" honours core.abbrev when preparing the insn sheet
for editing.
* "git status" during a cherry-pick shows which original commit is
being picked.
* Instead of typing four capital letters "HEAD", you can say "@" now,
e.g. "git log @".
* "git check-ignore" follows the same rule as "git add" and "git
status" in that the ignore/exclude mechanism does not take effect
on paths that are already tracked. With the "--no-index" option, it
can be used to diagnose which paths that should have been ignored
have been mistakenly added to the index.
* Some irrelevant "advice" messages that are shared with "git status"
output have been removed from the commit log template.
* "update-refs" learned a "--stdin" option to read multiple update
requests and perform them in an all-or-none fashion.
* Just like "make -C <directory>", "git -C <directory> ..." tells Git
to go there before doing anything else.
* Just like "git checkout -" knows to check out, and "git merge -"
knows to merge, the branch you were previously on, "git cherry-pick"
now understands "git cherry-pick -" to pick from the previous
branch.
* "git status" now omits the prefix to make its output a comment in a
commit log editor, which is not necessary for human consumption.
Scripts that parse the output of "git status" are advised to use
"git status --porcelain" instead, as its format is stable and easier
to parse.
* The ref syntax "foo^{tag}" (with the literal string "{tag}") peels a
tag ref to itself, i.e. it's a no-op., and fails if
"foo" is not a tag. "git rev-parse --verify v1.0^{tag}" is
a more convenient way than "test $(git cat-file -t v1.0) = tag" to
check if v1.0 is a tag.
* "git branch -v -v" (and "git status") did not distinguish among a
branch that is not based on any other branch, a branch that is in
sync with its upstream branch, and a branch that is configured with an
upstream branch that no longer exists.
* Earlier we started rejecting any attempt to add the 0{40} object name to
the index and to tree objects, but it sometimes is necessary to
allow this to be able to use tools like filter-branch to correct such
broken tree objects. "filter-branch" can again be used to do this.
* "git config" did not provide a way to set or access numbers larger
than a native "int" on the platform; it now provides 64-bit signed
integers on all platforms.
* "git pull --rebase" always chose to do the bog-standard flattening
rebase. You can tell it to run "rebase --preserve-merges" with
"git pull --rebase=preserve" or by
setting "pull.rebase" configuration to "preserve".
* "git push --no-thin" actually disables the "thin pack transfer"
optimization.
* Magic pathspecs like ":(icase)makefile" (matches both Makefile
and makefile) and ":(glob)foo/**/bar" (matches "bar" in "foo"
and any subdirectory of "foo") can be used in more places.
* The "http.*" variables can now be specified for individual URLs.
For example,
[http]
sslVerify = true
[http "https://weak.example.com/"]
sslVerify = false
would flip http.sslVerify off only when talking to that specific
site.
* "git mv A B" when moving a submodule has been taught to
relocate the submodule's working tree and to adjust the paths in the
.gitmodules file.
* "git blame" can now take more than one -L option to discover the
origin of multiple blocks of lines.
* The http transport clients can optionally ask to save cookies
with the http.savecookies configuration variable.
* "git push" learned a more fine grained control over a blunt
"--force" when requesting a non-fast-forward update with the
"--force-with-lease=<refname>:<expected object name>" option.
* "git diff --diff-filter=<classes of changes>" can now take
lowercase letters (e.g. "--diff-filter=d") to mean "show
everything but these classes". "git diff-files -q" is now a
deprecated synonym for "git diff-files --diff-filter=d".
* "git fetch" (hence "git pull" as well) learned to check
"fetch.prune" and "remote.*.prune" configuration variables and
to behave as if the "--prune" command line option was given.
* "git check-ignore -z" applied the NUL termination to both its input
(with --stdin) and its output, but "git check-attr -z" ignored the
option on the output side. Make both honor -z on the input and
output side the same way.
* "git whatchanged" may still be used by old timers, but mention of
it in documents meant for new users will only waste readers' time
wondering what the difference is between it and "git log". Make it
less prominent in the general part of the documentation and explain
that it is merely a "git log" with different default behaviour in
its own document.
Performance, Internal Implementation, etc.
* "git for-each-ref" when asking for merely the object name does not
have to parse the object pointed at by the refs; the codepath has
been optimized.
* The HTTP transport will try to use TCP keepalive when able.
* "git repack" is now written in C.
* Build procedure for MSVC has been updated.
* If a build-time fallback is set to "cat" instead of "less", we
should apply the same "no subprocess or pipe" optimization as we
apply to user-supplied GIT_PAGER=cat.
* Many commands use a --dashed-option as an operation mode selector
(e.g. "git tag --delete") that excludes other operation modes
(e.g. "git tag --delete --verify" is nonsense) and that cannot be
negated (e.g. "git tag --no-delete" is nonsense). The parse-options
API learned a new OPT_CMDMODE macro to make it easier to implement
such a set of options.
* OPT_BOOLEAN() in the parse-options API was misdesigned to be "counting
up" but many subcommands expect it to behave as "on/off". Update
them to use OPT_BOOL() which is a proper boolean.
* "git gc" exits early without doing any work when it detects
that another instance of itself is already running.
* Under memory pressure and/or file descriptor pressure, we used to
close pack windows that are not used and also closed filehandles to
open but unused packfiles. These are now controlled separately
to better cope with the load.
Also contains various documentation updates and code clean-ups.
Fixes since v1.8.4
------------------
Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
track are contained in this release (see the maintenance releases' notes for
details).
* An ancient How-To on serving Git repositories on an HTTP server
lacked a warning that it has been mostly superseded with a more
modern way.
(merge 6d52bc3 sc/doc-howto-dumb-http later to maint).
* The interaction between the use of Perl in our test suite and NO_PERL
has been clarified a bit.
(merge f8fc0ee jn/test-prereq-perl-doc later to maint).
* The synopsis section of the "git unpack-objects" documentation has been
clarified a bit.
(merge 61e2e22 vd/doc-unpack-objects later to maint).
* We did not generate the HTML version of the documentation to "git subtree"
in contrib/.
(merge 95c62fb jk/subtree-install-fix later to maint).
* A fast-import stream expresses a pathname with funny characters by
quoting them in C style; the remote-hg remote helper forgot to unquote
such a path.
(merge 1136265 ap/remote-hg-unquote-cquote later to maint).
* "git reset -p HEAD" has a codepath to special-case it to behave
differently from resetting to contents of other commits, but a
recent change broke it.
* Coloring around octopus merges in "log --graph" output was screwy.
(merge 339c17b hn/log-graph-color-octopus later to maint).
* "git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".
(merge bca3969 mm/checkout-auto-track-fix later to maint).
* One long-standing flaw in the pack transfer protocol used by "git
clone" was that there was no way to tell the other end which branch
"HEAD" points at, and the receiving end needed to guess. A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
branch pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.
(merge 360a326 jc/upload-pack-send-symref later to maint).
* We did not handle cases where the http transport gets redirected during
the authorization request (e.g. from http:// to https://).
(merge 70900ed jk/http-auth-redirects later to maint).
* Bash prompting code to deal with an SVN remote as an upstream
was coded in a way unsupported by older Bash versions (3.x).
(merge 52ec889 sg/prompt-svn-remote-fix later to maint).
* The fall-back parsing of commit objects with broken author or
committer lines was less robust than ideal in picking up the
timestamps.
(merge 03818a4 jk/split-broken-ident later to maint).
* "git rev-list --objects ^v1.0^ v1.0" gave the v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.
(merge 895c5ba jc/revision-range-unpeel later to maint).
* "git clone" wrote some progress messages to standard output, not
to standard error, and did not suppress them with the
--no-progress option.
(merge 643f918 jk/clone-progress-to-stderr later to maint).
* "format-patch --from=<whom>" forgot to omit an unnecessary in-body
from line, i.e. when <whom> is the same as the real author.
(merge 662cc30 jk/format-patch-from later to maint).
* "git shortlog" used to choke and die when there is a malformed
commit (e.g. missing authors); it now simply ignores such a commit
and keeps going.
(merge cd4f09e jk/shortlog-tolerate-broken-commit later to maint).
* "git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
(merge 6562928 jk/diff-algo later to maint).
* When running "fetch -q", a long silence while the sender side
computes the set of objects to send can be mistaken by proxies as
dropped connection. The server side has been taught to send a
small empty messages to keep the connection alive.
(merge 115dedd jk/upload-pack-keepalive later to maint).
* "git rebase" had a portability regression in v1.8.4 that triggered a
bug in some BSD shell implementations.
(merge 99855dd mm/rebase-continue-freebsd-WB later to maint).
* "git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking.
(merge b0f49ff jh/checkout-auto-tracking later to maint).
* When the web server responds with "405 Method Not Allowed", "git
http-backend" should tell the client what methods are allowed with
the "Allow" header.
(merge 9247be0 bc/http-backend-allow-405 later to maint).
* When there is no sufficient overlap between old and new history
during a "git fetch" into a shallow repository, objects that the
sending side knows the receiving end has were unnecessarily sent.
(merge f21d2a7 nd/fetch-into-shallow later to maint).
* "git cvsserver" computed the permission mode bits incorrectly for
executable files.
(merge 1b48d56 jc/cvsserver-perm-bit-fix later to maint).
* When send-email obtains an error message to die with upon
failure to start an SSL session, it tried to read the error string
from a wrong place.
(merge 6cb0c88 bc/send-email-ssl-die-message-fix later to maint).
* The implementation of "add -i" has some crippling code to work around an
ActiveState Perl limitation but it by mistake also triggered on Git
for Windows where MSYS perl is used.
(merge df17e77 js/add-i-mingw later to maint).
* We made sure that we notice when the user-supplied GIT_DIR is actually a
gitfile, but did not do the same when the default ".git" is a
gitfile.
(merge 487a2b7 nd/git-dir-pointing-at-gitfile later to maint).
* When an object is not found after checking the packfiles and the
loose object directory, read_sha1_file() re-checks the packfiles to
prevent racing with a concurrent repacker; teach the same logic to
has_sha1_file().
(merge 45e8a74 jk/has-sha1-file-retry-packed later to maint).
* "git commit --author=$name", when $name is not in the canonical
"A. U. Thor <au.thor@example.xz>" format, looks for a matching name
from existing history, but did not consult mailmap to grab the
preferred author name.
(merge ea16794 ap/commit-author-mailmap later to maint).
* "git ls-files -k" needs to crawl only the part of the working tree
that may overlap the paths in the index to find killed files, but
shared code with the logic to find all the untracked files, which
made it unnecessarily inefficient.
(merge 680be04 jc/ls-files-killed-optim later to maint).
* The shortened commit object names in the insn sheet that is prepared at the
beginning of a "rebase -i" session can become ambiguous as the
rebasing progresses and the repository gains more commits. Make
sure the internal record is kept with full 40-hex object names.
(merge 75c6976 es/rebase-i-no-abbrev later to maint).
* "git rebase --preserve-merges" internally used the merge machinery
and as a side effect left the merge summary message in the log, but
when rebasing there is no need for the merge summary.
(merge a9f739c rt/rebase-p-no-merge-summary later to maint).
* A call to xread() was used without a loop around it to cope with short
reads in the codepath to stream new contents to a pack.
(merge e92527c js/xread-in-full later to maint).
* "git rebase -i" forgot that the comment character is
configurable while reading its insn sheet.
(merge 7bca7af es/rebase-i-respect-core-commentchar later to maint).
* The mailmap support code read past the allocated buffer when the
mailmap file ended with an incomplete line.
(merge f972a16 jk/mailmap-incomplete-line later to maint).
* We used to send a large request to read(2)/write(2) as a single
system call, which was bad from the latency point of view when
the operation needs to be killed, and also triggered an error on
broken 64-bit systems that refuse to read or write more than 2GB
in one go.
(merge a487916 sp/clip-read-write-to-8mb later to maint).
* "git fetch" that auto-followed tags incorrectly reused the
connection with Git-aware transport helper (like the sample "ext::"
helper shipped with Git).
(merge 0f73f8b jc/transport-do-not-use-connect-twice-in-fetch later to maint).
* "git log --full-diff -- <pathspec>" showed a huge diff for paths
outside the given <pathspec> for each commit, instead of showing
the change relative to the parent of the commit. "git reflog -p"
had a similar problem.
(merge 838f9a1 tr/log-full-diff-keep-true-parents later to maint).
* Setting a submodule.*.path configuration variable to true (without
giving "= value") caused Git to segfault.
(merge 4b05440 jl/some-submodule-config-are-not-boolean later to maint).
* "git rebase -i" (there could be others, as the root cause is pretty
generic) fed a random, data dependent string to 'echo' and
expected it to come out literally, corrupting its error message.
(merge 89b0230 mm/no-shell-escape-in-die-message later to maint).
* Some people still use rather old versions of bash, which cannot
grok some constructs like 'printf -v varname' which the prompt and
completion code started to use recently.
(merge a44aa69 bc/completion-for-bash-3.0 later to maint).
* Code to read configuration from a blob object did not compile on
platforms with fgetc() etc. implemented as macros.
(merge 49d6cfa hv/config-from-blob later to maint-1.8.3).
* The recent "short-cut clone connectivity check" topic broke a
shallow repository when a fetch operation tries to auto-follow tags.
(merge 6da8bdc nd/fetch-pack-shallow-fix later to maint-1.8.3).
----------------------------------------------------------------
Changes since v1.8.5-rc2 are as follows:
Junio C Hamano (3):
Revert "upload-pack: send non-HEAD symbolic refs"
Git 1.8.4.4
Git 1.8.5-rc3
Marc Branchaud (1):
RelNotes: spelling & grammar fixes
Nguyễn Thái Ngọc Duy (1):
pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses
Torstein Hegge (1):
branch: fix --verbose output column alignment
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v1.8.4.4
@ 2013-11-20 22:06 7% Junio C Hamano
0 siblings, 0 replies; 6+ results
From: Junio C Hamano @ 2013-11-20 22:06 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
The latest maintenance release Git v1.8.4.4 is now available at
the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
1aaa1a51b599f19125e06fa6e839c9ff2e5ac941 git-1.8.4.4.tar.gz
c2ee47c2bbf8ede70eef2a1ba936a30aa0d78b2a git-htmldocs-1.8.4.4.tar.gz
4637e22fd2fe59cf00b4a105f5104af9bfea8c2c git-manpages-1.8.4.4.tar.gz
The following public repositories all have a copy of the v1.8.4.4
tag and the maint branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Also, http://www.kernel.org/pub/software/scm/git/ has copies of the
release tarballs.
Git v1.8.4.4 Release Notes
========================
Fixes since v1.8.4.3
--------------------
* The fix in v1.8.4.3 to the pack transfer protocol to propagate
the target of symbolic refs broke "git clone/git fetch" from a
repository with too many symbolic refs. As a hotfix/workaround,
we transfer only the information on HEAD.
----------------------------------------------------------------
Changes since v1.8.4.3 are as follows:
Junio C Hamano (2):
Revert "upload-pack: send non-HEAD symbolic refs"
Git 1.8.4.4
^ permalink raw reply [relevance 7%]
Results 1-6 of 6 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2013-11-20 22:06 7% [ANNOUNCE] Git v1.8.4.4 Junio C Hamano
2013-11-20 22:10 1% [ANNOUNCE] Git v1.8.5-rc3 Junio C Hamano
2014-01-14 2:09 4% BUG: manpage for git-pull mentions a non-valid option -m in a comment Ivan Zakharyaschev
2014-01-14 18:26 0% ` Re* " Junio C Hamano
2014-01-14 18:51 0% ` Torsten Bögershausen
2014-10-03 10:41 2% Compile fails on OSX 10.9 with FSF GCC in common crypto Volker Braun
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).