Hello community,
here is the log from the commit of package git for openSUSE:Factory checked in
at 2012-10-19 22:55:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git (Old)
and /work/SRC/openSUSE:Factory/.git.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git", Maintainer is "ti...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/git/git.changes 2012-10-16 21:32:05.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2012-10-19
22:55:46.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Oct 18 14:50:30 UTC 2012 - dougla...@outlook.com
+
+- updated to version 1.7.12.4:
+
+ * "git fetch" over the dumb-http revision walker could segfault when
+ curl's multi interface was used.
+
+ * It was possible to give specific paths for "asciidoc" and other
+ tools in the documentation toolchain, but not for "xmlto".
+
+ * "gitweb" did not give the correct committer timezone in its feed
+ output due to a typo.
+
+ * The "-Xours" (and similarly -Xtheirs) backend option to "git
+ merge -s recursive" was ignored for binary files. Now it is
+ honored.
+
+ * The "binary" synthetic attribute made "diff" to treat the path as
+ binary, but not "merge".
+
+ Also contains many documentation updates.
+
+-------------------------------------------------------------------
Old:
----
git-1.7.12.3.tar.gz
New:
----
git-1.7.12.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.bHQlRA/_old 2012-10-19 22:55:49.000000000 +0200
+++ /var/tmp/diff_new_pack.bHQlRA/_new 2012-10-19 22:55:49.000000000 +0200
@@ -30,7 +30,7 @@
BuildRequires: python
BuildRequires: sgml-skel
BuildRequires: xmlto
-Version: 1.7.12.3
+Version: 1.7.12.4
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0
++++++ git-1.7.12.3.tar.gz -> git-1.7.12.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/Makefile
new/git-1.7.12.4/Documentation/Makefile
--- old/git-1.7.12.3/Documentation/Makefile 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/Documentation/Makefile 2012-10-17 20:59:21.000000000
+0200
@@ -44,9 +44,10 @@
man7dir=$(mandir)/man7
# DESTDIR=
-ASCIIDOC=asciidoc
+ASCIIDOC = asciidoc
ASCIIDOC_EXTRA =
MANPAGE_XSL = manpage-normal.xsl
+XMLTO = xmlto
XMLTO_EXTRA =
INSTALL?=install
RM ?= rm -f
@@ -245,7 +246,7 @@
%.1 %.5 %.7 : %.xml manpage-base-url.xsl
$(QUIET_XMLTO)$(RM) $@ && \
- xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
%.xml : %.txt
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/RelNotes/1.7.12.4.txt
new/git-1.7.12.4/Documentation/RelNotes/1.7.12.4.txt
--- old/git-1.7.12.3/Documentation/RelNotes/1.7.12.4.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/git-1.7.12.4/Documentation/RelNotes/1.7.12.4.txt 2012-10-17
20:59:21.000000000 +0200
@@ -0,0 +1,23 @@
+Git 1.7.12.4 Release Notes
+==========================
+
+Fixes since v1.7.12.3
+---------------------
+
+ * "git fetch" over the dumb-http revision walker could segfault when
+ curl's multi interface was used.
+
+ * It was possible to give specific paths for "asciidoc" and other
+ tools in the documentation toolchain, but not for "xmlto".
+
+ * "gitweb" did not give the correct committer timezone in its feed
+ output due to a typo.
+
+ * The "-Xours" (and similarly -Xtheirs) backend option to "git
+ merge -s recursive" was ignored for binary files. Now it is
+ honored.
+
+ * The "binary" synthetic attribute made "diff" to treat the path as
+ binary, but not "merge".
+
+Also contains many documentation updates.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/fetch-options.txt
new/git-1.7.12.4/Documentation/fetch-options.txt
--- old/git-1.7.12.3/Documentation/fetch-options.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/fetch-options.txt 2012-10-17
20:59:21.000000000 +0200
@@ -10,7 +10,8 @@
--depth=<depth>::
Deepen the history of a 'shallow' repository created by
`git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
- by the specified number of commits.
+ to the specified number of commits from the tip of each remote
+ branch history. Tags for the deepened commits are not fetched.
ifndef::git-pull[]
--dry-run::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/git-add.txt
new/git-1.7.12.4/Documentation/git-add.txt
--- old/git-1.7.12.3/Documentation/git-add.txt 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/Documentation/git-add.txt 2012-10-17 20:59:21.000000000
+0200
@@ -155,7 +155,7 @@
The optional configuration variable `core.excludesfile` indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
-those in info/exclude. See linkgit:gitrepository-layout[5].
+those in info/exclude. See linkgit:gitignore[5].
EXAMPLES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/git-branch.txt
new/git-1.7.12.4/Documentation/git-branch.txt
--- old/git-1.7.12.3/Documentation/git-branch.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/git-branch.txt 2012-10-17
20:59:21.000000000 +0200
@@ -129,11 +129,13 @@
use `git branch --list <pattern>` to list matching branches.
-v::
+-vv::
--verbose::
When in list mode,
show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
- the name of the upstream branch, as well.
+ the name of the upstream branch, as well (see also `git remote
+ show <remote>`).
-q::
--quiet::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/git-clean.txt
new/git-1.7.12.4/Documentation/git-clean.txt
--- old/git-1.7.12.3/Documentation/git-clean.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/git-clean.txt 2012-10-17
20:59:21.000000000 +0200
@@ -63,6 +63,10 @@
Remove only files ignored by git. This may be useful to rebuild
everything from scratch, but keep manually created files.
+SEE ALSO
+--------
+linkgit:gitignore[5]
+
GIT
---
Part of the linkgit:git[1] suite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/git.txt
new/git-1.7.12.4/Documentation/git.txt
--- old/git-1.7.12.3/Documentation/git.txt 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/Documentation/git.txt 2012-10-17 20:59:21.000000000
+0200
@@ -43,9 +43,10 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.12.3/git.html[documentation for release 1.7.12.3]
+* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
* release notes for
+ link:RelNotes/1.7.12.4.txt[1.7.12.4],
link:RelNotes/1.7.12.3.txt[1.7.12.3],
link:RelNotes/1.7.12.2.txt[1.7.12.2],
link:RelNotes/1.7.12.1.txt[1.7.12.1],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/gitattributes.txt
new/git-1.7.12.4/Documentation/gitattributes.txt
--- old/git-1.7.12.3/Documentation/gitattributes.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/gitattributes.txt 2012-10-17
20:59:21.000000000 +0200
@@ -66,6 +66,11 @@
global and system-wide files are considered (they have the lowest
precedence).
+When the `.gitattributes` file is missing from the work tree, the
+path in the index is used as a fall-back. During checkout process,
+`.gitattributes` in the index is used and then the file in the
+working tree is used as a fall-back.
+
If you wish to affect only a single repository (i.e., to assign
attributes to files that are particular to
one user's workflow for that repository), then
@@ -927,7 +932,7 @@
macro attribute "binary" is equivalent to:
------------
-[attr]binary -diff -text
+[attr]binary -diff -merge -text
------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/gitcli.txt
new/git-1.7.12.4/Documentation/gitcli.txt
--- old/git-1.7.12.3/Documentation/gitcli.txt 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/Documentation/gitcli.txt 2012-10-17 20:59:21.000000000
+0200
@@ -93,7 +93,7 @@
From the git 1.5.4 series and further, many git commands (not all of them at
the
time of the writing though) come with an enhanced option parser.
-Here is an exhaustive list of the facilities provided by this option parser.
+Here is a list of the facilities provided by this option parser.
Magic Options
@@ -137,6 +137,16 @@
`git clean -fdx`.
+Abbreviating long options
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Commands that support the enhanced option parser accepts unique
+prefix of a long option as if it is fully spelled out, but use this
+with a caution. For example, `git commit --amen` behaves as if you
+typed `git commit --amend`, but that is true only until a later version
+of Git introduces another option that shares the same prefix,
+e.g `git commit --amenity" option.
+
+
Separating argument from the option
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You can write the mandatory option parameter to an option as a separate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/gitignore.txt
new/git-1.7.12.4/Documentation/gitignore.txt
--- old/git-1.7.12.3/Documentation/gitignore.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/gitignore.txt 2012-10-17
20:59:21.000000000 +0200
@@ -41,18 +41,24 @@
variable 'core.excludesfile'.
Which file to place a pattern in depends on how the pattern is meant to
-be used. Patterns which should be version-controlled and distributed to
-other repositories via clone (i.e., files that all developers will want
-to ignore) should go into a `.gitignore` file. Patterns which are
-specific to a particular repository but which do not need to be shared
-with other related repositories (e.g., auxiliary files that live inside
-the repository but are specific to one user's workflow) should go into
-the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to
-ignore in all situations (e.g., backup or temporary files generated by
-the user's editor of choice) generally go into a file specified by
-`core.excludesfile` in the user's `~/.gitconfig`. Its default value is
-$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty,
-$HOME/.config/git/ignore is used instead.
+be used.
+
+ * Patterns which should be version-controlled and distributed to
+ other repositories via clone (i.e., files that all developers will want
+ to ignore) should go into a `.gitignore` file.
+
+ * Patterns which are
+ specific to a particular repository but which do not need to be shared
+ with other related repositories (e.g., auxiliary files that live inside
+ the repository but are specific to one user's workflow) should go into
+ the `$GIT_DIR/info/exclude` file.
+
+ * Patterns which a user wants git to
+ ignore in all situations (e.g., backup or temporary files generated by
+ the user's editor of choice) generally go into a file specified by
+ `core.excludesfile` in the user's `~/.gitconfig`. Its default value is
+ $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or
+ empty, $HOME/.config/git/ignore is used instead.
The underlying git plumbing tools, such as
'git ls-files' and 'git read-tree', read
@@ -68,11 +74,15 @@
for readability.
- A line starting with # serves as a comment.
+ Put a backslash ("`\`") in front of the first hash for patterns
+ that begin with a hash.
- - An optional prefix '!' which negates the pattern; any
+ - An optional prefix "`!`" which negates the pattern; any
matching file excluded by a previous pattern will become
included again. If a negated pattern matches, this will
override lower precedence patterns sources.
+ Put a backslash ("`\`") in front of the first "`!`" for patterns
+ that begin with a literal "`!`", for example, "`\!important!.txt`".
- If the pattern ends with a slash, it is removed for the
purpose of the following description, but it would only find
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/merge-strategies.txt
new/git-1.7.12.4/Documentation/merge-strategies.txt
--- old/git-1.7.12.3/Documentation/merge-strategies.txt 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/Documentation/merge-strategies.txt 2012-10-17
20:59:21.000000000 +0200
@@ -32,13 +32,14 @@
This option forces conflicting hunks to be auto-resolved cleanly by
favoring 'our' version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
+
This should not be confused with the 'ours' merge strategy, which does not
even look at what the other tree contains at all. It discards everything
the other tree did, declaring 'our' history contains all that happened in it.
theirs;;
- This is opposite of 'ours'.
+ This is the opposite of 'ours'.
patience;;
With this option, 'merge-recursive' spends a little extra time
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/Documentation/urls.txt
new/git-1.7.12.4/Documentation/urls.txt
--- old/git-1.7.12.3/Documentation/urls.txt 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/Documentation/urls.txt 2012-10-17 20:59:21.000000000
+0200
@@ -6,8 +6,12 @@
Depending on the transport protocol, some of this information may be
absent.
-Git natively supports ssh, git, http, https, ftp, ftps, and rsync
-protocols. The following syntaxes may be used with them:
+Git supports ssh, git, http, and https protocols (in addition, ftp,
+and ftps can be used for fetching and rsync can be used for fetching
+and pushing, but these are inefficient and deprecated; do not use
+them).
+
+The following syntaxes may be used with them:
- ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/
- git://host.xz{startsb}:port{endsb}/path/to/repo.git/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/GIT-VERSION-GEN
new/git-1.7.12.4/GIT-VERSION-GEN
--- old/git-1.7.12.3/GIT-VERSION-GEN 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/GIT-VERSION-GEN 2012-10-17 20:59:21.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12.3
+DEF_VER=v1.7.12.4
LF='
'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/RelNotes new/git-1.7.12.4/RelNotes
--- old/git-1.7.12.3/RelNotes 2012-10-19 22:55:50.000000000 +0200
+++ new/git-1.7.12.4/RelNotes 2012-10-19 22:55:50.000000000 +0200
@@ -1 +1 @@
-symbolic link to Documentation/RelNotes/1.7.12.3.txt
+symbolic link to Documentation/RelNotes/1.7.12.4.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/attr.c new/git-1.7.12.4/attr.c
--- old/git-1.7.12.3/attr.c 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/attr.c 2012-10-17 20:59:21.000000000 +0200
@@ -306,7 +306,7 @@
}
static const char *builtin_attr[] = {
- "[attr]binary -diff -text",
+ "[attr]binary -diff -merge -text",
NULL,
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/configure new/git-1.7.12.4/configure
--- old/git-1.7.12.3/configure 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/configure 2012-10-17 20:59:22.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for git 1.7.12.3.
+# Generated by GNU Autoconf 2.67 for git 1.7.12.4.
#
# Report bugs to <g...@vger.kernel.org>.
#
@@ -552,8 +552,8 @@
# Identity of this package.
PACKAGE_NAME='git'
PACKAGE_TARNAME='git'
-PACKAGE_VERSION='1.7.12.3'
-PACKAGE_STRING='git 1.7.12.3'
+PACKAGE_VERSION='1.7.12.4'
+PACKAGE_STRING='git 1.7.12.4'
PACKAGE_BUGREPORT='g...@vger.kernel.org'
PACKAGE_URL=''
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures git 1.7.12.3 to adapt to many kinds of systems.
+\`configure' configures git 1.7.12.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1335,7 +1335,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of git 1.7.12.3:";;
+ short | recursive ) echo "Configuration of git 1.7.12.4:";;
esac
cat <<\_ACEOF
@@ -1474,7 +1474,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-git configure 1.7.12.3
+git configure 1.7.12.4
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1954,7 +1954,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by git $as_me 1.7.12.3, which was
+It was created by git $as_me 1.7.12.4, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -7118,7 +7118,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by git $as_me 1.7.12.3, which was
+This file was extended by git $as_me 1.7.12.4, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7175,7 +7175,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-git config.status 1.7.12.3
+git config.status 1.7.12.4
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/contrib/hooks/post-receive-email
new/git-1.7.12.4/contrib/hooks/post-receive-email
--- old/git-1.7.12.3/contrib/hooks/post-receive-email 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/contrib/hooks/post-receive-email 2012-10-17
20:59:21.000000000 +0200
@@ -403,7 +403,7 @@
echo " \\"
echo " O -- O -- O ($oldrev)"
echo ""
- echo "The removed revisions are not necessarilly gone -
if another reference"
+ echo "The removed revisions are not necessarily gone -
if another reference"
echo "still refers to them they will stay in the
repository."
rewind_only=1
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/git.spec new/git-1.7.12.4/git.spec
--- old/git-1.7.12.3/git.spec 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/git.spec 2012-10-17 20:59:22.000000000 +0200
@@ -1,7 +1,7 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
-Version: 1.7.12.3
+Version: 1.7.12.4
Release: 1%{?dist}
Summary: Core git tools
License: GPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/gitweb/gitweb.perl
new/git-1.7.12.4/gitweb/gitweb.perl
--- old/git-1.7.12.3/gitweb/gitweb.perl 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/gitweb/gitweb.perl 2012-10-17 20:59:21.000000000 +0200
@@ -8028,7 +8028,7 @@
%latest_commit = %{$commitlist[0]};
my $latest_epoch = $latest_commit{'committer_epoch'};
exit_if_unmodified_since($latest_epoch);
- %latest_date = parse_date($latest_epoch,
$latest_commit{'comitter_tz'});
+ %latest_date = parse_date($latest_epoch,
$latest_commit{'committer_tz'});
}
print $cgi->header(
-type => $content_type,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/http.c new/git-1.7.12.4/http.c
--- old/git-1.7.12.3/http.c 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/http.c 2012-10-17 20:59:21.000000000 +0200
@@ -745,10 +745,9 @@
return strbuf_detach(&buf, NULL);
}
-int handle_curl_result(struct active_request_slot *slot)
+int handle_curl_result(struct active_request_slot *slot,
+ struct slot_results *results)
{
- struct slot_results *results = slot->results;
-
if (results->curl_result == CURLE_OK) {
credential_approve(&http_auth);
return HTTP_OK;
@@ -822,7 +821,7 @@
if (start_active_slot(slot)) {
run_active_slot(slot);
- ret = handle_curl_result(slot);
+ ret = handle_curl_result(slot, &results);
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/http.h new/git-1.7.12.4/http.h
--- old/git-1.7.12.3/http.h 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/http.h 2012-10-17 20:59:21.000000000 +0200
@@ -78,7 +78,8 @@
extern void run_active_slot(struct active_request_slot *slot);
extern void finish_active_slot(struct active_request_slot *slot);
extern void finish_all_active_slots(void);
-extern int handle_curl_result(struct active_request_slot *slot);
+extern int handle_curl_result(struct active_request_slot *slot,
+ struct slot_results *results);
#ifdef USE_CURL_MULTI
extern void fill_active_slots(void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/ll-merge.c new/git-1.7.12.4/ll-merge.c
--- old/git-1.7.12.3/ll-merge.c 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/ll-merge.c 2012-10-17 20:59:21.000000000 +0200
@@ -35,7 +35,7 @@
*/
static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
- const char *path_unused,
+ const char *path,
mmfile_t *orig, const char *orig_name,
mmfile_t *src1, const char *name1,
mmfile_t *src2, const char *name2,
@@ -46,16 +46,34 @@
assert(opts);
/*
- * The tentative merge result is "ours" for the final round,
- * or common ancestor for an internal merge. Still return
- * "conflicted merge" status.
+ * The tentative merge result is the or common ancestor for an internal
merge.
*/
- stolen = opts->virtual_ancestor ? orig : src1;
+ if (opts->virtual_ancestor) {
+ stolen = orig;
+ } else {
+ switch (opts->variant) {
+ default:
+ warning("Cannot merge binary files: %s (%s vs. %s)",
+ path, name1, name2);
+ /* fallthru */
+ case XDL_MERGE_FAVOR_OURS:
+ stolen = src1;
+ break;
+ case XDL_MERGE_FAVOR_THEIRS:
+ stolen = src2;
+ break;
+ }
+ }
result->ptr = stolen->ptr;
result->size = stolen->size;
stolen->ptr = NULL;
- return 1;
+
+ /*
+ * With -Xtheirs or -Xours, we have cleanly merged;
+ * otherwise we got a conflict.
+ */
+ return (opts->variant ? 0 : 1);
}
static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
@@ -73,8 +91,6 @@
if (buffer_is_binary(orig->ptr, orig->size) ||
buffer_is_binary(src1->ptr, src1->size) ||
buffer_is_binary(src2->ptr, src2->size)) {
- warning("Cannot merge binary files: %s (%s vs. %s)",
- path, name1, name2);
return ll_binary_merge(drv_unused, result,
path,
orig, orig_name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/po/de.po new/git-1.7.12.4/po/de.po
--- old/git-1.7.12.3/po/de.po 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/po/de.po 2012-10-17 20:59:21.000000000 +0200
@@ -55,7 +55,7 @@
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
-msgstr "Dem Projektarchiv fehlen folgende vorrausgesetzte Versionen:"
+msgstr "Dem Projektarchiv fehlen folgende vorausgesetzte Versionen:"
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
@@ -1758,7 +1758,7 @@
#: builtin/apply.c:4291
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-"entfernt <Anzahl> vorrangestellte Schrägstriche von herkömmlichen "
+"entfernt <Anzahl> vorangestellte Schrägstriche von herkömmlichen "
"Differenzpfaden"
#: builtin/apply.c:4294
@@ -2065,7 +2065,7 @@
#: builtin/branch.c:613
msgid "cannot rename the current branch while not on any."
msgstr ""
-"Kann aktuellen Zweig nicht umbennen, solange du dich auf keinem befindest."
+"Kann aktuellen Zweig nicht umbenennen, solange du dich auf keinem befindest."
#: builtin/branch.c:623
#, c-format
@@ -2353,7 +2353,7 @@
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-"git checkout: --ours/--theirs, --force and --merge sind inkompatibel wenn\n"
+"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"du aus der Bereitstellung auscheckst."
#: builtin/checkout.c:1093
@@ -3666,7 +3666,7 @@
#: builtin/init-db.c:363
#, c-format
msgid "Could not create git link %s"
-msgstr "Konnte git-Verknüfung %s nicht erstellen"
+msgstr "Konnte git-Verknüpfung %s nicht erstellen"
#.
#. * TRANSLATORS: The first '%s' is either "Reinitialized
@@ -3778,11 +3778,11 @@
#: builtin/log.c:1205
msgid "-n and -k are mutually exclusive."
-msgstr "-n und -k schliessen sich gegenseitig aus"
+msgstr "-n und -k schließen sich gegenseitig aus"
#: builtin/log.c:1207
msgid "--subject-prefix and -k are mutually exclusive."
-msgstr "--subject-prefix und -k schliessen sich gegenseitig aus"
+msgstr "--subject-prefix und -k schließen sich gegenseitig aus"
#: builtin/log.c:1215
msgid "--name-only does not make sense"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/remote-curl.c
new/git-1.7.12.4/remote-curl.c
--- old/git-1.7.12.3/remote-curl.c 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/remote-curl.c 2012-10-17 20:59:21.000000000 +0200
@@ -355,7 +355,7 @@
slot->curl_result = curl_easy_perform(slot->curl);
finish_active_slot(slot);
- err = handle_curl_result(slot);
+ err = handle_curl_result(slot, &results);
if (err != HTTP_OK && err != HTTP_REAUTH) {
error("RPC failed; result=%d, HTTP code = %ld",
results.curl_result, results.http_code);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t0000-basic.sh
new/git-1.7.12.4/t/t0000-basic.sh
--- old/git-1.7.12.3/t/t0000-basic.sh 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/t/t0000-basic.sh 2012-10-17 20:59:21.000000000 +0200
@@ -18,16 +18,6 @@
modification *should* take notice and update the test vectors here.
'
-################################################################
-# It appears that people try to run tests without building...
-
-../git >/dev/null
-if test $? != 1
-then
- echo >&2 'You do not seem to have built git yet.'
- exit 1
-fi
-
. ./test-lib.sh
################################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t1450-fsck.sh
new/git-1.7.12.4/t/t1450-fsck.sh
--- old/git-1.7.12.3/t/t1450-fsck.sh 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/t/t1450-fsck.sh 2012-10-17 20:59:21.000000000 +0200
@@ -177,9 +177,7 @@
test_when_finished "remove_object $tag" &&
echo $tag >.git/refs/tags/wrong &&
test_when_finished "git update-ref -d refs/tags/wrong" &&
- test_must_fail git fsck --tags 2>out &&
- cat out &&
- grep "error in tag.*broken links" out
+ test_must_fail git fsck --tags
'
test_expect_success 'cleaned up' '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t5400-send-pack.sh
new/git-1.7.12.4/t/t5400-send-pack.sh
--- old/git-1.7.12.3/t/t5400-send-pack.sh 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/t/t5400-send-pack.sh 2012-10-17 20:59:21.000000000
+0200
@@ -159,7 +159,7 @@
git commit -a -m "Second commit" &&
git repack
) &&
- cp -a parent child &&
+ cp -R parent child &&
(
# Set the child to auto-pack if more than one pack exists
cd child &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t5550-http-fetch.sh
new/git-1.7.12.4/t/t5550-http-fetch.sh
--- old/git-1.7.12.3/t/t5550-http-fetch.sh 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/t/t5550-http-fetch.sh 2012-10-17 20:59:21.000000000
+0200
@@ -22,7 +22,7 @@
'
test_expect_success 'create http-accessible bare repository with loose
objects' '
- cp -a .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+ cp -R .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git config core.bare true &&
mkdir -p hooks &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t5800-remote-helpers.sh
new/git-1.7.12.4/t/t5800-remote-helpers.sh
--- old/git-1.7.12.3/t/t5800-remote-helpers.sh 2012-10-08 21:20:19.000000000
+0200
+++ new/git-1.7.12.4/t/t5800-remote-helpers.sh 2012-10-17 20:59:21.000000000
+0200
@@ -76,7 +76,7 @@
# git-remote-testgit, but is too slow to leave in for general use.
: test_expect_success 'racily pushing to local repo' '
test_when_finished "rm -rf server2 localclone2" &&
- cp -a server server2 &&
+ cp -R server server2 &&
git clone "testgit::${PWD}/server2" localclone2 &&
(cd localclone2 &&
echo content >>file &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/t6037-merge-ours-theirs.sh
new/git-1.7.12.4/t/t6037-merge-ours-theirs.sh
--- old/git-1.7.12.3/t/t6037-merge-ours-theirs.sh 2012-10-08
21:20:19.000000000 +0200
+++ new/git-1.7.12.4/t/t6037-merge-ours-theirs.sh 2012-10-17
20:59:21.000000000 +0200
@@ -53,7 +53,19 @@
! grep 1 file
'
-test_expect_success 'pull with -X' '
+test_expect_success 'binary file with -Xours/-Xtheirs' '
+ echo file binary >.gitattributes &&
+
+ git reset --hard master &&
+ git merge -s recursive -X theirs side &&
+ git diff --exit-code side HEAD -- file &&
+
+ git reset --hard master &&
+ git merge -s recursive -X ours side &&
+ git diff --exit-code master HEAD -- file
+'
+
+test_expect_success 'pull passes -X to underlying merge' '
git reset --hard master && git pull -s recursive -Xours . side &&
git reset --hard master && git pull -s recursive -X ours . side &&
git reset --hard master && git pull -s recursive -Xtheirs . side &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/t/test-lib.sh
new/git-1.7.12.4/t/test-lib.sh
--- old/git-1.7.12.3/t/test-lib.sh 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/t/test-lib.sh 2012-10-17 20:59:21.000000000 +0200
@@ -15,22 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/ .
-# if --tee was passed, write the output not only to the terminal, but
-# additionally to the file test-results/$BASENAME.out, too.
-case "$GIT_TEST_TEE_STARTED, $* " in
-done,*)
- # do not redirect again
- ;;
-*' --tee '*|*' --va'*)
- mkdir -p test-results
- BASE=test-results/$(basename "$0" .sh)
- (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
- echo $? > $BASE.exit) | tee $BASE.out
- test "$(cat $BASE.exit)" = 0
- exit
- ;;
-esac
-
# Keep the original TERM for say_color
ORIGINAL_TERM=$TERM
@@ -51,9 +35,34 @@
fi
GIT_BUILD_DIR="$TEST_DIRECTORY"/..
+################################################################
+# It appears that people try to run tests without building...
+"$GIT_BUILD_DIR/git" >/dev/null
+if test $? != 1
+then
+ echo >&2 'error: you do not seem to have built git yet.'
+ exit 1
+fi
+
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
export PERL_PATH SHELL_PATH
+# if --tee was passed, write the output not only to the terminal, but
+# additionally to the file test-results/$BASENAME.out, too.
+case "$GIT_TEST_TEE_STARTED, $* " in
+done,*)
+ # do not redirect again
+ ;;
+*' --tee '*|*' --va'*)
+ mkdir -p test-results
+ BASE=test-results/$(basename "$0" .sh)
+ (GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1;
+ echo $? > $BASE.exit) | tee $BASE.out
+ test "$(cat $BASE.exit)" = 0
+ exit
+ ;;
+esac
+
# For repeatability, reset the environment to known value.
LANG=C
LC_ALL=C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.3/version new/git-1.7.12.4/version
--- old/git-1.7.12.3/version 2012-10-08 21:20:19.000000000 +0200
+++ new/git-1.7.12.4/version 2012-10-17 20:59:22.000000000 +0200
@@ -1 +1 @@
-1.7.12.3
+1.7.12.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
