Hello community,
here is the log from the commit of package git for openSUSE:Factory checked in
at 2012-10-11 09:23:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10 09:21:39.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2012-10-11
09:23:55.000000000 +0200
@@ -1,0 +2,34 @@
+Thu Oct 11 00:19:07 CST 2012 - dougla...@outlook.com
+
+- updated to version 1.7.12.3:
+
+ * "git am" mishandled a patch attached as application/octet-stream
+ (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not
+ honored correctly.
+
+ * It was unclear in the documentation for "git blame" that it is
+ unnecessary for users to use the "--follow" option.
+
+ * A repository created with "git clone --single" had its fetch
+ refspecs set up just like a clone without "--single", leading the
+ subsequent "git fetch" to slurp all the other branches, defeating
+ the whole point of specifying "only this branch".
+
+ * "git fetch" over http had an old workaround for an unlikely server
+ misconfiguration; it turns out that this hurts debuggability of the
+ configuration in general, and has been reverted.
+
+ * "git fetch" over http advertised that it supports "deflate", which
+ is much less common, and did not advertise the more common "gzip" on
+ its Accept-Encoding header.
+
+ * "git receive-pack" (the counterpart to "git push") did not give
+ progress output while processing objects it received to the puser
+ when run over the smart-http protocol.
+
+ * "git status" honored the ignore=dirty settings in .gitmodules but
+ "git commit" didn't.
+
+ Also contains a handful of documentation updates.
+
+-------------------------------------------------------------------
Old:
----
git-1.7.12.2.tar.gz
New:
----
git-1.7.12.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.B8gzqj/_old 2012-10-11 09:23:58.000000000 +0200
+++ /var/tmp/diff_new_pack.B8gzqj/_new 2012-10-11 09:23:58.000000000 +0200
@@ -30,7 +30,7 @@
BuildRequires: python
BuildRequires: sgml-skel
BuildRequires: xmlto
-Version: 1.7.12.2
+Version: 1.7.12.3
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0
++++++ git-1.7.12.2.tar.gz -> git-1.7.12.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/Documentation/RelNotes/1.7.12.3.txt
new/git-1.7.12.3/Documentation/RelNotes/1.7.12.3.txt
--- old/git-1.7.12.2/Documentation/RelNotes/1.7.12.3.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/git-1.7.12.3/Documentation/RelNotes/1.7.12.3.txt 2012-10-08
21:20:19.000000000 +0200
@@ -0,0 +1,34 @@
+Git 1.7.12.3 Release Notes
+==========================
+
+Fixes since v1.7.12.2
+---------------------
+
+ * "git am" mishandled a patch attached as application/octet-stream
+ (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not
+ honored correctly.
+
+ * It was unclear in the documentation for "git blame" that it is
+ unnecessary for users to use the "--follow" option.
+
+ * A repository created with "git clone --single" had its fetch
+ refspecs set up just like a clone without "--single", leading the
+ subsequent "git fetch" to slurp all the other branches, defeating
+ the whole point of specifying "only this branch".
+
+ * "git fetch" over http had an old workaround for an unlikely server
+ misconfiguration; it turns out that this hurts debuggability of the
+ configuration in general, and has been reverted.
+
+ * "git fetch" over http advertised that it supports "deflate", which
+ is much less common, and did not advertise the more common "gzip" on
+ its Accept-Encoding header.
+
+ * "git receive-pack" (the counterpart to "git push") did not give
+ progress output while processing objects it received to the puser
+ when run over the smart-http protocol.
+
+ * "git status" honored the ignore=dirty settings in .gitmodules but
+ "git commit" didn't.
+
+Also contains a handful of documentation updates.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/Documentation/git-blame.txt
new/git-1.7.12.3/Documentation/git-blame.txt
--- old/git-1.7.12.2/Documentation/git-blame.txt 2012-09-30
10:03:21.000000000 +0200
+++ new/git-1.7.12.3/Documentation/git-blame.txt 2012-10-08
21:20:19.000000000 +0200
@@ -20,6 +20,12 @@
The command can also limit the range of lines annotated.
+The origin of lines is automatically followed across whole-file
+renames (currently there is no option to turn the rename-following
+off). To follow lines moved from one file to another, or to follow
+lines that were copied and pasted from another file, etc., see the
+`-C` and `-M` options.
+
The report does not tell you anything about lines which have been deleted or
replaced; you need to use a tool such as 'git diff' or the "pickaxe"
interface briefly mentioned in the following paragraph.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/Documentation/git-clone.txt
new/git-1.7.12.3/Documentation/git-clone.txt
--- old/git-1.7.12.2/Documentation/git-clone.txt 2012-09-30
10:03:21.000000000 +0200
+++ new/git-1.7.12.3/Documentation/git-clone.txt 2012-10-08
21:20:19.000000000 +0200
@@ -29,7 +29,8 @@
After the clone, a plain `git fetch` without arguments will update
all the remote-tracking branches, and a `git pull` without
arguments will in addition merge the remote master branch into the
-current master branch, if any.
+current master branch, if any (this is untrue when "--single-branch"
+is given; see below).
This default configuration is achieved by creating references to
the remote branch heads under `refs/remotes/origin` and
@@ -152,9 +153,10 @@
-b <name>::
Instead of pointing the newly created HEAD to the branch pointed
to by the cloned repository's HEAD, point to `<name>` branch
- instead. `--branch` can also take tags and treat them like
- detached HEAD. In a non-bare repository, this is the branch
- that will be checked out.
+ instead. In a non-bare repository, this is the branch that will
+ be checked out.
+ `--branch` can also take tags and detaches the HEAD at that commit
+ in the resulting repository.
--upload-pack <upload-pack>::
-u <upload-pack>::
@@ -193,6 +195,11 @@
clone with the `--depth` option, this is the default, unless
`--no-single-branch` is given to fetch the histories near the
tips of all branches.
+ Further fetches into the resulting repository will only update the
+ remote tracking branch for the branch this option was used for the
+ initial cloning. If the HEAD at the remote did not point at any
+ branch when `--single-branch` clone was made, no remote tracking
+ branch is created.
--recursive::
--recurse-submodules::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/Documentation/git-submodule.txt
new/git-1.7.12.3/Documentation/git-submodule.txt
--- old/git-1.7.12.2/Documentation/git-submodule.txt 2012-09-30
10:03:21.000000000 +0200
+++ new/git-1.7.12.3/Documentation/git-submodule.txt 2012-10-08
21:20:19.000000000 +0200
@@ -112,7 +112,6 @@
initialized, `+` if the currently checked out submodule commit
does not match the SHA-1 found in the index of the containing
repository and `U` if the submodule has merge conflicts.
- This command is the default command for 'git submodule'.
+
If `--recursive` is specified, this command will recurse into nested
submodules, and show their status as well.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/Documentation/git.txt
new/git-1.7.12.3/Documentation/git.txt
--- old/git-1.7.12.2/Documentation/git.txt 2012-09-30 10:03:21.000000000
+0200
+++ new/git-1.7.12.3/Documentation/git.txt 2012-10-08 21:20:19.000000000
+0200
@@ -43,9 +43,10 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.12.2/git.html[documentation for release 1.7.12.2]
+* link:v1.7.12.3/git.html[documentation for release 1.7.12.3]
* release notes for
+ 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],
link:RelNotes/1.7.12.txt[1.7.12].
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/GIT-VERSION-GEN
new/git-1.7.12.3/GIT-VERSION-GEN
--- old/git-1.7.12.2/GIT-VERSION-GEN 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/GIT-VERSION-GEN 2012-10-08 21:20:19.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.12.2
+DEF_VER=v1.7.12.3
LF='
'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/RelNotes new/git-1.7.12.3/RelNotes
--- old/git-1.7.12.2/RelNotes 2012-10-11 09:23:58.000000000 +0200
+++ new/git-1.7.12.3/RelNotes 2012-10-11 09:23:58.000000000 +0200
@@ -1 +1 @@
-symbolic link to Documentation/RelNotes/1.7.12.2.txt
+symbolic link to Documentation/RelNotes/1.7.12.3.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/builtin/clone.c
new/git-1.7.12.3/builtin/clone.c
--- old/git-1.7.12.2/builtin/clone.c 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/builtin/clone.c 2012-10-08 21:20:19.000000000 +0200
@@ -610,6 +610,54 @@
}
}
+static void write_refspec_config(const char* src_ref_prefix,
+ const struct ref* our_head_points_at,
+ const struct ref* remote_head_points_at, struct strbuf*
branch_top)
+{
+ struct strbuf key = STRBUF_INIT;
+ struct strbuf value = STRBUF_INIT;
+
+ if (option_mirror || !option_bare) {
+ if (option_single_branch && !option_mirror) {
+ if (option_branch) {
+ if (strstr(our_head_points_at->name,
"refs/tags/"))
+ strbuf_addf(&value, "+%s:%s",
our_head_points_at->name,
+ our_head_points_at->name);
+ else
+ strbuf_addf(&value, "+%s:%s%s",
our_head_points_at->name,
+ branch_top->buf, option_branch);
+ } else if (remote_head_points_at) {
+ strbuf_addf(&value, "+%s:%s%s",
remote_head_points_at->name,
+ branch_top->buf,
+
skip_prefix(remote_head_points_at->name, "refs/heads/"));
+ }
+ /*
+ * otherwise, the next "git fetch" will
+ * simply fetch from HEAD without updating
+ * any remote tracking branch, which is what
+ * we want.
+ */
+ } else {
+ strbuf_addf(&value, "+%s*:%s*", src_ref_prefix,
branch_top->buf);
+ }
+ /* Configure the remote */
+ if (value.len) {
+ strbuf_addf(&key, "remote.%s.fetch", option_origin);
+ git_config_set_multivar(key.buf, value.buf, "^$", 0);
+ strbuf_reset(&key);
+
+ if (option_mirror) {
+ strbuf_addf(&key, "remote.%s.mirror",
option_origin);
+ git_config_set(key.buf, "true");
+ strbuf_reset(&key);
+ }
+ }
+ }
+
+ strbuf_release(&key);
+ strbuf_release(&value);
+}
+
int cmd_clone(int argc, const char **argv, const char *prefix)
{
int is_bundle = 0, is_local;
@@ -755,20 +803,6 @@
}
strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);
-
- if (option_mirror || !option_bare) {
- /* Configure the remote */
- strbuf_addf(&key, "remote.%s.fetch", option_origin);
- git_config_set_multivar(key.buf, value.buf, "^$", 0);
- strbuf_reset(&key);
-
- if (option_mirror) {
- strbuf_addf(&key, "remote.%s.mirror", option_origin);
- git_config_set(key.buf, "true");
- strbuf_reset(&key);
- }
- }
-
strbuf_addf(&key, "remote.%s.url", option_origin);
git_config_set(key.buf, repo);
strbuf_reset(&key);
@@ -853,6 +887,9 @@
"refs/heads/master");
}
+ write_refspec_config(src_ref_prefix, our_head_points_at,
+ remote_head_points_at, &branch_top);
+
if (is_local)
clone_local(path, git_dir);
else if (refs && complete_refs_before_fetch)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/builtin/commit.c
new/git-1.7.12.3/builtin/commit.c
--- old/git-1.7.12.2/builtin/commit.c 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/builtin/commit.c 2012-10-08 21:20:19.000000000 +0200
@@ -1452,6 +1452,7 @@
usage_with_options(builtin_commit_usage,
builtin_commit_options);
wt_status_prepare(&s);
+ gitmodules_config();
git_config(git_commit_config, &s);
determine_whence(&s);
s.colopts = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/builtin/mailinfo.c
new/git-1.7.12.3/builtin/mailinfo.c
--- old/git-1.7.12.2/builtin/mailinfo.c 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/builtin/mailinfo.c 2012-10-08 21:20:19.000000000 +0200
@@ -19,9 +19,6 @@
static enum {
TE_DONTCARE, TE_QP, TE_BASE64
} transfer_encoding;
-static enum {
- TYPE_TEXT, TYPE_OTHER
-} message_type;
static struct strbuf charset = STRBUF_INIT;
static int patch_lines;
@@ -184,8 +181,6 @@
struct strbuf *boundary = xmalloc(sizeof(struct strbuf));
strbuf_init(boundary, line->len);
- if (!strcasestr(line->buf, "text/"))
- message_type = TYPE_OTHER;
if (slurp_attr(line->buf, "boundary=", boundary)) {
strbuf_insert(boundary, 0, "--", 2);
if (++content_top > &content[MAX_BOUNDARIES]) {
@@ -681,7 +676,6 @@
/* set some defaults */
transfer_encoding = TE_DONTCARE;
strbuf_reset(&charset);
- message_type = TYPE_TEXT;
/* slurp in this section's info */
while (read_one_header_line(&line, fin))
@@ -895,11 +889,6 @@
strbuf_insert(&line, 0, prev.buf, prev.len);
strbuf_reset(&prev);
- /* binary data most likely doesn't have newlines */
- if (message_type != TYPE_TEXT) {
- handle_filter(&line);
- break;
- }
/*
* This is a decoded line that may contain
* multiple new lines. Pass only one chunk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/builtin/receive-pack.c
new/git-1.7.12.3/builtin/receive-pack.c
--- old/git-1.7.12.2/builtin/receive-pack.c 2012-09-30 10:03:21.000000000
+0200
+++ new/git-1.7.12.3/builtin/receive-pack.c 2012-10-08 21:20:19.000000000
+0200
@@ -701,7 +701,7 @@
if (unpacker_error) {
for (cmd = commands; cmd; cmd = cmd->next)
- cmd->error_string = "n/a (unpacker error)";
+ cmd->error_string = "unpacker error";
return;
}
@@ -801,7 +801,7 @@
static const char *pack_lockfile;
-static const char *unpack(void)
+static const char *unpack(int err_fd)
{
struct pack_header hdr;
const char *hdr_err;
@@ -821,6 +821,7 @@
if (ntohl(hdr.hdr_entries) < unpack_limit) {
int code, i = 0;
+ struct child_process child;
const char *unpacker[5];
unpacker[i++] = "unpack-objects";
if (quiet)
@@ -829,7 +830,12 @@
unpacker[i++] = "--strict";
unpacker[i++] = hdr_arg;
unpacker[i++] = NULL;
- code = run_command_v_opt(unpacker, RUN_GIT_CMD);
+ memset(&child, 0, sizeof(child));
+ child.argv = unpacker;
+ child.no_stdout = 1;
+ child.err = err_fd;
+ child.git_cmd = 1;
+ code = run_command(&child);
if (!code)
return NULL;
return "unpack-objects abnormal exit";
@@ -854,6 +860,7 @@
memset(&ip, 0, sizeof(ip));
ip.argv = keeper;
ip.out = -1;
+ ip.err = err_fd;
ip.git_cmd = 1;
status = start_command(&ip);
if (status) {
@@ -870,6 +877,26 @@
}
}
+static const char *unpack_with_sideband(void)
+{
+ struct async muxer;
+ const char *ret;
+
+ if (!use_sideband)
+ return unpack(0);
+
+ memset(&muxer, 0, sizeof(muxer));
+ muxer.proc = copy_to_sideband;
+ muxer.in = -1;
+ if (start_async(&muxer))
+ return NULL;
+
+ ret = unpack(muxer.in);
+
+ finish_async(&muxer);
+ return ret;
+}
+
static void report(struct command *commands, const char *unpack_status)
{
struct command *cmd;
@@ -967,7 +994,7 @@
const char *unpack_status = NULL;
if (!delete_only(commands))
- unpack_status = unpack();
+ unpack_status = unpack_with_sideband();
execute_commands(commands, unpack_status);
if (pack_lockfile)
unlink_or_warn(pack_lockfile);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/configure new/git-1.7.12.3/configure
--- old/git-1.7.12.2/configure 2012-09-30 10:03:22.000000000 +0200
+++ new/git-1.7.12.3/configure 2012-10-08 21:20:19.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.2.
+# Generated by GNU Autoconf 2.67 for git 1.7.12.3.
#
# 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.2'
-PACKAGE_STRING='git 1.7.12.2'
+PACKAGE_VERSION='1.7.12.3'
+PACKAGE_STRING='git 1.7.12.3'
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.2 to adapt to many kinds of systems.
+\`configure' configures git 1.7.12.3 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.2:";;
+ short | recursive ) echo "Configuration of git 1.7.12.3:";;
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.2
+git configure 1.7.12.3
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.2, which was
+It was created by git $as_me 1.7.12.3, 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.2, which was
+This file was extended by git $as_me 1.7.12.3, 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.2
+git config.status 1.7.12.3
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.2/git-submodule.sh
new/git-1.7.12.3/git-submodule.sh
--- old/git-1.7.12.2/git-submodule.sh 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/git-submodule.sh 2012-10-08 21:20:19.000000000 +0200
@@ -1107,7 +1107,15 @@
done
# No command word defaults to "status"
-test -n "$command" || command=status
+if test -z "$command"
+then
+ if test $# = 0
+ then
+ command=status
+ else
+ usage
+ fi
+fi
# "-b branch" is accepted only by "add"
if test -n "$branch" && test "$command" != add
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/git.spec new/git-1.7.12.3/git.spec
--- old/git-1.7.12.2/git.spec 2012-09-30 10:03:22.000000000 +0200
+++ new/git-1.7.12.3/git.spec 2012-10-08 21:20:19.000000000 +0200
@@ -1,7 +1,7 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
-Version: 1.7.12.2
+Version: 1.7.12.3
Release: 1%{?dist}
Summary: Core git tools
License: GPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/http.c new/git-1.7.12.3/http.c
--- old/git-1.7.12.2/http.c 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/http.c 2012-10-08 21:20:19.000000000 +0200
@@ -818,6 +818,7 @@
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
+ curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
if (start_active_slot(slot)) {
run_active_slot(slot);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/po/sv.po new/git-1.7.12.3/po/sv.po
--- old/git-1.7.12.2/po/sv.po 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/po/sv.po 2012-10-08 21:20:19.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: git 1.7.12\n"
"Report-Msgid-Bugs-To: Git Mailing List <g...@vger.kernel.org>\n"
"POT-Creation-Date: 2012-08-06 23:47+0800\n"
-"PO-Revision-Date: 2012-08-14 09:58+0100\n"
+"PO-Revision-Date: 2012-10-02 08:15+0100\n"
"Last-Translator: Peter Krefting <pe...@softwolves.pp.se>\n"
"Language-Team: Swedish <tp...@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -3381,7 +3381,7 @@
#: builtin/index-pack.c:986
msgid "Receiving objects"
-msgstr "Tar bort objekt"
+msgstr "Tar emot objekt"
#: builtin/index-pack.c:986
msgid "Indexing objects"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/remote-curl.c
new/git-1.7.12.3/remote-curl.c
--- old/git-1.7.12.2/remote-curl.c 2012-09-30 10:03:21.000000000 +0200
+++ new/git-1.7.12.3/remote-curl.c 2012-10-08 21:20:19.000000000 +0200
@@ -95,7 +95,7 @@
struct strbuf buffer = STRBUF_INIT;
struct discovery *last = last_discovery;
char *refs_url;
- int http_ret, is_http = 0, proto_git_candidate = 1;
+ int http_ret, is_http = 0;
if (last && !strcmp(service, last->service))
return last;
@@ -113,19 +113,6 @@
refs_url = strbuf_detach(&buffer, NULL);
http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
-
- /* try again with "plain" url (no ? or & appended) */
- if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) {
- free(refs_url);
- strbuf_reset(&buffer);
-
- proto_git_candidate = 0;
- strbuf_addf(&buffer, "%sinfo/refs", url);
- refs_url = strbuf_detach(&buffer, NULL);
-
- http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
- }
-
switch (http_ret) {
case HTTP_OK:
break;
@@ -144,8 +131,7 @@
last->buf_alloc = strbuf_detach(&buffer, &last->len);
last->buf = last->buf_alloc;
- if (is_http && proto_git_candidate
- && 5 <= last->len && last->buf[4] == '#') {
+ if (is_http && 5 <= last->len && last->buf[4] == '#') {
/* smart HTTP response; validate that the service
* pkt-line matches our request.
*/
@@ -393,7 +379,7 @@
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
- curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
+ curl_easy_setopt(slot->curl, CURLOPT_ENCODING, NULL);
curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, "0000");
curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
@@ -449,7 +435,7 @@
curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
- curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
+ curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
headers = curl_slist_append(headers, rpc->hdr_content_type);
headers = curl_slist_append(headers, rpc->hdr_accept);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/t/t5504-fetch-receive-strict.sh
new/git-1.7.12.3/t/t5504-fetch-receive-strict.sh
--- old/git-1.7.12.2/t/t5504-fetch-receive-strict.sh 2012-09-30
10:03:21.000000000 +0200
+++ new/git-1.7.12.3/t/t5504-fetch-receive-strict.sh 2012-10-08
21:20:19.000000000 +0200
@@ -89,7 +89,7 @@
cat >exp <<EOF
To dst
-! refs/heads/master:refs/heads/test [remote rejected] (n/a
(unpacker error))
+! refs/heads/master:refs/heads/test [remote rejected] (unpacker
error)
EOF
test_expect_success 'push with receive.fsckobjects' '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/t/t5551-http-fetch.sh
new/git-1.7.12.3/t/t5551-http-fetch.sh
--- old/git-1.7.12.2/t/t5551-http-fetch.sh 2012-09-30 10:03:21.000000000
+0200
+++ new/git-1.7.12.3/t/t5551-http-fetch.sh 2012-10-08 21:20:19.000000000
+0200
@@ -32,13 +32,14 @@
cat >exp <<EOF
> GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1
> Accept: */*
+> Accept-Encoding: gzip
> Pragma: no-cache
< HTTP/1.1 200 OK
< Pragma: no-cache
< Cache-Control: no-cache, max-age=0, must-revalidate
< Content-Type: application/x-git-upload-pack-advertisement
> POST /smart/repo.git/git-upload-pack HTTP/1.1
-> Accept-Encoding: deflate, gzip
+> Accept-Encoding: gzip
> Content-Type: application/x-git-upload-pack-request
> Accept: application/x-git-upload-pack-result
> Content-Length: xxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/t/t5709-clone-refspec.sh
new/git-1.7.12.3/t/t5709-clone-refspec.sh
--- old/git-1.7.12.2/t/t5709-clone-refspec.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/git-1.7.12.3/t/t5709-clone-refspec.sh 2012-10-08 21:20:19.000000000
+0200
@@ -0,0 +1,156 @@
+#!/bin/sh
+
+test_description='test refspec written by clone-command'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ # Make two branches, "master" and "side"
+ echo one >file &&
+ git add file &&
+ git commit -m one &&
+ echo two >file &&
+ git commit -a -m two &&
+ git tag two &&
+ echo three >file &&
+ git commit -a -m three &&
+ git checkout -b side &&
+ echo four >file &&
+ git commit -a -m four &&
+ git checkout master &&
+
+ # default clone
+ git clone . dir_all &&
+
+ # default --single that follows HEAD=master
+ git clone --single-branch . dir_master &&
+
+ # default --single that follows HEAD=side
+ git checkout side &&
+ git clone --single-branch . dir_side &&
+
+ # explicit --single that follows side
+ git checkout master &&
+ git clone --single-branch --branch side . dir_side2 &&
+
+ # default --single with --mirror
+ git clone --single-branch --mirror . dir_mirror &&
+
+ # default --single with --branch and --mirror
+ git clone --single-branch --mirror --branch side . dir_mirror_side &&
+
+ # --single that does not know what branch to follow
+ git checkout two^ &&
+ git clone --single-branch . dir_detached &&
+
+ # explicit --single with tag
+ git clone --single-branch --branch two . dir_tag &&
+
+ # advance both "master" and "side" branches
+ git checkout side &&
+ echo five >file &&
+ git commit -a -m five &&
+ git checkout master &&
+ echo six >file &&
+ git commit -a -m six &&
+
+ # update tag
+ git tag -d two && git tag two
+'
+
+test_expect_success 'by default all branches will be kept updated' '
+ (
+ cd dir_all && git fetch &&
+ git for-each-ref refs/remotes/origin |
+ sed -e "/HEAD$/d" \
+ -e "s|/remotes/origin/|/heads/|" >../actual
+ ) &&
+ # follow both master and side
+ git for-each-ref refs/heads >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'by default no tags will be kept updated' '
+ (
+ cd dir_all && git fetch &&
+ git for-each-ref refs/tags >../actual
+ ) &&
+ git for-each-ref refs/tags >expect &&
+ test_must_fail test_cmp expect actual
+'
+
+test_expect_success '--single-branch while HEAD pointing at master' '
+ (
+ cd dir_master && git fetch &&
+ git for-each-ref refs/remotes/origin |
+ sed -e "/HEAD$/d" \
+ -e "s|/remotes/origin/|/heads/|" >../actual
+ ) &&
+ # only follow master
+ git for-each-ref refs/heads/master >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch while HEAD pointing at side' '
+ (
+ cd dir_side && git fetch &&
+ git for-each-ref refs/remotes/origin |
+ sed -e "/HEAD$/d" \
+ -e "s|/remotes/origin/|/heads/|" >../actual
+ ) &&
+ # only follow side
+ git for-each-ref refs/heads/side >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch with explicit --branch side' '
+ (
+ cd dir_side2 && git fetch &&
+ git for-each-ref refs/remotes/origin |
+ sed -e "/HEAD$/d" \
+ -e "s|/remotes/origin/|/heads/|" >../actual
+ ) &&
+ # only follow side
+ git for-each-ref refs/heads/side >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch with explicit --branch with tag fetches
updated tag' '
+ (
+ cd dir_tag && git fetch &&
+ git for-each-ref refs/tags >../actual
+ ) &&
+ git for-each-ref refs/tags >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch with --mirror' '
+ (
+ cd dir_mirror && git fetch &&
+ git for-each-ref refs > ../actual
+ ) &&
+ git for-each-ref refs >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch with explicit --branch and --mirror' '
+ (
+ cd dir_mirror_side && git fetch &&
+ git for-each-ref refs > ../actual
+ ) &&
+ git for-each-ref refs >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--single-branch with detached' '
+ (
+ cd dir_detached && git fetch &&
+ git for-each-ref refs/remotes/origin |
+ sed -e "/HEAD$/d" \
+ -e "s|/remotes/origin/|/heads/|" >../actual
+ )
+ # nothing
+ >expect &&
+ test_cmp expect actual
+'
+
+test_done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/t/t7400-submodule-basic.sh
new/git-1.7.12.3/t/t7400-submodule-basic.sh
--- old/git-1.7.12.2/t/t7400-submodule-basic.sh 2012-09-30 10:03:21.000000000
+0200
+++ new/git-1.7.12.3/t/t7400-submodule-basic.sh 2012-10-08 21:20:19.000000000
+0200
@@ -438,8 +438,8 @@
git checkout second
'
-test_expect_success 'submodule <invalid-path> warns' '
- test_failure_with_unknown_submodule
+test_expect_success 'submodule <invalid-subcommand> fails' '
+ test_must_fail git submodule no-such-subcommand
'
test_expect_success 'add submodules without specifying an explicit path' '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-1.7.12.2/version new/git-1.7.12.3/version
--- old/git-1.7.12.2/version 2012-09-30 10:03:22.000000000 +0200
+++ new/git-1.7.12.3/version 2012-10-08 21:20:19.000000000 +0200
@@ -1 +1 @@
-1.7.12.2
+1.7.12.3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
