Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2012-08-16 21:57:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2012-08-12 15:25:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2012-08-16 21:57:29.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Aug 16 11:57:53 CEST 2012 - [email protected] + +- updated to version 1.7.11.5: + * The Makefile rule to create assembly output (primarily for + debugging purposes) did not create it next to the source. + * The code to avoid mistaken attempt to add the object directory + itself as its own alternate could read beyond end of a string while + comparison. + * On some architectures, "block-sha1" did not compile correctly + when compilers inferred alignment guarantees from our source we + did not intend to make. + * When talking to a remote running ssh on IPv6 enabled host, whose + address is spelled as "[HOST]:PORT", we did not parse the address + correctly and failed to connect. + * git-blame.el (in compat/) have been updated to use Elisp more + correctly. + * "git checkout <branchname>" to come back from a detached HEAD state + incorrectly computed reachability of the detached HEAD, resulting + in unnecessary warnings. + * "git mergetool" did not support --tool-help option to give the list + of supported backends, like "git difftool" does. + * "git grep" stopped spawning an external "grep" long time ago, but a + duplicated test to check internal and external "grep" was left + behind. + +------------------------------------------------------------------- Old: ---- git-1.7.11.4.tar.gz New: ---- git-1.7.11.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.xjOEyu/_old 2012-08-16 21:57:33.000000000 +0200 +++ /var/tmp/diff_new_pack.xjOEyu/_new 2012-08-16 21:57:33.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.7.11.4 +Version: 1.7.11.5 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ git-1.7.11.4.tar.gz -> git-1.7.11.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/RelNotes/1.7.11.5.txt new/git-1.7.11.5/Documentation/RelNotes/1.7.11.5.txt --- old/git-1.7.11.4/Documentation/RelNotes/1.7.11.5.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/git-1.7.11.5/Documentation/RelNotes/1.7.11.5.txt 2012-08-15 23:54:28.000000000 +0200 @@ -0,0 +1,36 @@ +Git v1.7.11.5 Release Notes +=========================== + +Fixes since v1.7.11.4 +--------------------- + + * The Makefile rule to create assembly output (primarily for + debugging purposes) did not create it next to the source. + + * The code to avoid mistaken attempt to add the object directory + itself as its own alternate could read beyond end of a string while + comparison. + + * On some architectures, "block-sha1" did not compile correctly + when compilers inferred alignment guarantees from our source we + did not intend to make. + + * When talking to a remote running ssh on IPv6 enabled host, whose + address is spelled as "[HOST]:PORT", we did not parse the address + correctly and failed to connect. + + * git-blame.el (in compat/) have been updated to use Elisp more + correctly. + + * "git checkout <branchname>" to come back from a detached HEAD state + incorrectly computed reachability of the detached HEAD, resulting + in unnecessary warnings. + + * "git mergetool" did not support --tool-help option to give the list + of supported backends, like "git difftool" does. + + * "git grep" stopped spawning an external "grep" long time ago, but a + duplicated test to check internal and external "grep" was left + behind. + +Also contains minor typofixes and documentation updates. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git-commit.txt new/git-1.7.11.5/Documentation/git-commit.txt --- old/git-1.7.11.4/Documentation/git-commit.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git-commit.txt 2012-08-15 23:54:28.000000000 +0200 @@ -101,12 +101,16 @@ When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies `--dry-run`. +--branch:: + Show the branch and tracking info even in short-format. + --porcelain:: When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`. -z:: +--null:: When showing `short` or `porcelain` status output, terminate entries in the status output with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. @@ -189,6 +193,10 @@ current tip -- if it was a merge, it will have the parents of the current tip as parents -- so the current top commit is discarded. + +--no-post-rewrite:: + Bypass the post-rewrite hook. + + -- It is a rough equivalent for: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git-daemon.txt new/git-1.7.11.5/Documentation/git-daemon.txt --- old/git-1.7.11.4/Documentation/git-daemon.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git-daemon.txt 2012-08-15 23:54:28.000000000 +0200 @@ -204,7 +204,7 @@ can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be - enabled by `daemon.receivepack` configuration item to + enabled by setting `daemon.receivepack` configuration item to `true`. EXAMPLES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git-merge.txt new/git-1.7.11.5/Documentation/git-merge.txt --- old/git-1.7.11.4/Documentation/git-merge.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git-merge.txt 2012-08-15 23:54:28.000000000 +0200 @@ -181,7 +181,7 @@ however, git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area. -By default, git uses the same style as that is used by "merge" program +By default, git uses the same style as the one used by the "merge" program from the RCS suite to present such a conflicted hunk, like this: ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git-mergetool.txt new/git-1.7.11.5/Documentation/git-mergetool.txt --- old/git-1.7.11.4/Documentation/git-mergetool.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git-mergetool.txt 2012-08-15 23:54:28.000000000 +0200 @@ -27,9 +27,9 @@ -t <tool>:: --tool=<tool>:: Use the merge resolution program specified by <tool>. - Valid merge tools are: - araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3, - meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff. + Valid values include emerge, gvimdiff, kdiff3, + meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` + for the list of valid <tool> settings. + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git-rebase.txt new/git-1.7.11.5/Documentation/git-rebase.txt --- old/git-1.7.11.4/Documentation/git-rebase.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git-rebase.txt 2012-08-15 23:54:28.000000000 +0200 @@ -273,7 +273,7 @@ Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and - 'theirs' as noted in above for the `-m` option. + 'theirs' as noted above for the `-m` option. -q:: --quiet:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/git.txt new/git-1.7.11.5/Documentation/git.txt --- old/git-1.7.11.4/Documentation/git.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/git.txt 2012-08-15 23:54:28.000000000 +0200 @@ -44,9 +44,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.11.4/git.html[documentation for release 1.7.11.4] +* link:v1.7.11.5/git.html[documentation for release 1.7.11.5] * release notes for + link:RelNotes/1.7.11.5.txt[1.7.11.5], link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], link:RelNotes/1.7.11.2.txt[1.7.11.2], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/glossary-content.txt new/git-1.7.11.5/Documentation/glossary-content.txt --- old/git-1.7.11.4/Documentation/glossary-content.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/glossary-content.txt 2012-08-15 23:54:28.000000000 +0200 @@ -117,7 +117,7 @@ [[def_ent]]ent:: Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See - `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth + http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth explanation. Avoid this term, not to confuse people. [[def_evil_merge]]evil merge:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/rev-list-options.txt new/git-1.7.11.5/Documentation/rev-list-options.txt --- old/git-1.7.11.4/Documentation/rev-list-options.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/rev-list-options.txt 2012-08-15 23:54:28.000000000 +0200 @@ -760,7 +760,7 @@ --cc:: - This flag implies the '-c' options and further compresses the + This flag implies the '-c' option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/revisions.txt new/git-1.7.11.5/Documentation/revisions.txt --- old/git-1.7.11.4/Documentation/revisions.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/revisions.txt 2012-08-15 23:54:28.000000000 +0200 @@ -24,22 +24,22 @@ object referenced by 'refs/heads/master'. If you happen to have both 'heads/master' and 'tags/master', you can explicitly say 'heads/master' to tell git which one you mean. - When ambiguous, a '<name>' is disambiguated by taking the + When ambiguous, a '<refname>' is disambiguated by taking the first match in the following rules: - . If '$GIT_DIR/<name>' exists, that is what you mean (this is usually + . If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD' and 'CHERRY_PICK_HEAD'); - . otherwise, 'refs/<name>' if it exists; + . otherwise, 'refs/<refname>' if it exists; . otherwise, 'refs/tags/<refname>' if it exists; - . otherwise, 'refs/heads/<name>' if it exists; + . otherwise, 'refs/heads/<refname>' if it exists; - . otherwise, 'refs/remotes/<name>' if it exists; + . otherwise, 'refs/remotes/<refname>' if it exists; - . otherwise, 'refs/remotes/<name>/HEAD' if it exists. + . otherwise, 'refs/remotes/<refname>/HEAD' if it exists. + 'HEAD' names the commit on which you based the changes in the working tree. 'FETCH_HEAD' records the branch which you fetched from a remote repository @@ -218,13 +218,44 @@ parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes all of its parents. +To summarize: + +'<rev>':: + Include commits that are reachable from (i.e. ancestors of) + <rev>. + +'{caret}<rev>':: + Exclude commits that are reachable from (i.e. ancestors of) + <rev>. + +'<rev1>..<rev2>':: + Include commits that are reachable from <rev2> but exclude + those that are reachable from <rev1>. + +'<rev1>\...<rev2>':: + Include commits that are reachable from either <rev1> or + <rev2> but exclude those that are reachable from both. + +'<rev>{caret}@', e.g. 'HEAD{caret}@':: + A suffix '{caret}' followed by an at sign is the same as listing + all parents of '<rev>' (meaning, include anything reachable from + its parents, but not the commit itself). + +'<rev>{caret}!', e.g. 'HEAD{caret}!':: + A suffix '{caret}' followed by an exclamation mark is the same + as giving commit '<rev>' and then all its parents prefixed with + '{caret}' to exclude them (and their ancestors). + Here are a handful of examples: D G H D D F G H I J D F ^G D H D ^D B E I J F B + B..C C B...C G H D E B C ^D B C E I J F B C + C I J F C C^@ I J F + C^! C F^! D G H D F diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Documentation/user-manual.txt new/git-1.7.11.5/Documentation/user-manual.txt --- old/git-1.7.11.4/Documentation/user-manual.txt 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Documentation/user-manual.txt 2012-08-15 23:54:28.000000000 +0200 @@ -2870,7 +2870,7 @@ You can also add a "+" to force the update each time: ------------------------------------------------- -$ git config remote.example.fetch +master:ref/remotes/example/master +$ git config remote.example.fetch +master:refs/remotes/example/master ------------------------------------------------- Don't do this unless you're sure you won't mind "git fetch" possibly @@ -2966,7 +2966,7 @@ - a tree: The SHA-1 name of a tree object (as defined below), representing the contents of a directory at a certain point in time. -- parent(s): The SHA-1 name of some number of commits which represent the +- parent(s): The SHA-1 name(s) of some number of commits which represent the immediately previous step(s) in the history of the project. The example above has one parent; merge commits may have more than one. A commit with no parents is called a "root" commit, and @@ -3363,8 +3363,8 @@ :100644 100644 oldsha... 4b9458b... M somedirectory/myfile ------------------------------------------------ -This tells you that the immediately preceding version of the file was -"newsha", and that the immediately following version was "oldsha". +This tells you that the immediately following version of the file was +"newsha", and that the immediately preceding version was "oldsha". You also know the commit messages that went with the change from oldsha to 4b9458b and with the change from 4b9458b to newsha. @@ -4035,8 +4035,8 @@ Each line of the `git ls-files --unmerged` output begins with the blob mode bits, blob SHA-1, 'stage number', and the filename. The 'stage number' is git's way to say which tree it -came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD` -tree, and stage3 `$target` tree. +came from: stage 1 corresponds to the `$orig` tree, stage 2 to +the `HEAD` tree, and stage 3 to the `$target` tree. Earlier we said that trivial merges are done inside `git read-tree -m`. For example, if the file did not change diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/GIT-VERSION-GEN new/git-1.7.11.5/GIT-VERSION-GEN --- old/git-1.7.11.4/GIT-VERSION-GEN 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/GIT-VERSION-GEN 2012-08-15 23:54:28.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11.4 +DEF_VER=v1.7.11.5 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/Makefile new/git-1.7.11.5/Makefile --- old/git-1.7.11.4/Makefile 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/Makefile 2012-08-15 23:54:28.000000000 +0200 @@ -127,9 +127,8 @@ # specify your own (or DarwinPort's) include directories and # library directories by defining CFLAGS and LDFLAGS appropriately. # -# Define BLK_SHA1 environment variable if you want the C version -# of the SHA1 that assumes you can do unaligned 32-bit loads and -# have a fast htonl() function. +# Define BLK_SHA1 environment variable to make use of the bundled +# optimized C SHA1 routine. # # Define PPC_SHA1 environment variable when running make to make use of # a bundled SHA1 routine optimized for PowerPC. @@ -2209,7 +2208,7 @@ endif %.s: %.c GIT-CFLAGS FORCE - $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< + $(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< ifdef USE_COMPUTED_HEADER_DEPENDENCIES # Take advantage of gcc's on-the-fly dependency generation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/RelNotes new/git-1.7.11.5/RelNotes --- old/git-1.7.11.4/RelNotes 2012-08-16 21:57:34.000000000 +0200 +++ new/git-1.7.11.5/RelNotes 2012-08-16 21:57:34.000000000 +0200 @@ -1 +1 @@ -symbolic link to Documentation/RelNotes/1.7.11.4.txt +symbolic link to Documentation/RelNotes/1.7.11.5.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/block-sha1/sha1.c new/git-1.7.11.5/block-sha1/sha1.c --- old/git-1.7.11.4/block-sha1/sha1.c 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/block-sha1/sha1.c 2012-08-15 23:54:28.000000000 +0200 @@ -101,8 +101,8 @@ * Where do we get the source from? The first 16 iterations get it from * the input data, the next mix it from the 512-bit array. */ -#define SHA_SRC(t) get_be32(data + t) -#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) +#define SHA_SRC(t) get_be32((unsigned char *) block + (t)*4) +#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1); #define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ unsigned int TEMP = input(t); setW(t, TEMP); \ @@ -115,7 +115,7 @@ #define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E ) #define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0xca62c1d6, A, B, C, D, E ) -static void blk_SHA1_Block(blk_SHA_CTX *ctx, const unsigned int *data) +static void blk_SHA1_Block(blk_SHA_CTX *ctx, const void *block) { unsigned int A,B,C,D,E; unsigned int array[16]; @@ -126,7 +126,7 @@ D = ctx->H[3]; E = ctx->H[4]; - /* Round 1 - iterations 0-16 take their input from 'data' */ + /* Round 1 - iterations 0-16 take their input from 'block' */ T_0_15( 0, A, B, C, D, E); T_0_15( 1, E, A, B, C, D); T_0_15( 2, D, E, A, B, C); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/builtin/checkout.c new/git-1.7.11.5/builtin/checkout.c --- old/git-1.7.11.4/builtin/checkout.c 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/builtin/checkout.c 2012-08-15 23:54:28.000000000 +0200 @@ -605,7 +605,7 @@ const unsigned char *sha1, int flags, void *cb_data) { - add_pending_sha1(cb_data, refname, sha1, flags | UNINTERESTING); + add_pending_sha1(cb_data, refname, sha1, UNINTERESTING); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/configure new/git-1.7.11.5/configure --- old/git-1.7.11.4/configure 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/configure 2012-08-15 23:54:29.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.11.4. +# Generated by GNU Autoconf 2.67 for git 1.7.11.5. # # Report bugs to <[email protected]>. # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='git' PACKAGE_TARNAME='git' -PACKAGE_VERSION='1.7.11.4' -PACKAGE_STRING='git 1.7.11.4' +PACKAGE_VERSION='1.7.11.5' +PACKAGE_STRING='git 1.7.11.5' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1275,7 +1275,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.11.4 to adapt to many kinds of systems. +\`configure' configures git 1.7.11.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of git 1.7.11.4:";; + short | recursive ) echo "Configuration of git 1.7.11.5:";; esac cat <<\_ACEOF @@ -1475,7 +1475,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -git configure 1.7.11.4 +git configure 1.7.11.5 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1955,7 +1955,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.11.4, which was +It was created by git $as_me 1.7.11.5, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -7106,7 +7106,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.11.4, which was +This file was extended by git $as_me 1.7.11.5, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7159,7 +7159,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.11.4 +git config.status 1.7.11.5 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.11.4/connect.c new/git-1.7.11.5/connect.c --- old/git-1.7.11.4/connect.c 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/connect.c 2012-08-15 23:54:28.000000000 +0200 @@ -536,7 +536,7 @@ * Add support for ssh port: ssh://host.xy:<port>/... */ if (protocol == PROTO_SSH && host != url) - port = get_port(host); + port = get_port(end); if (protocol == PROTO_GIT) { /* These underlying connection commands die() if they diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/contrib/emacs/git-blame.el new/git-1.7.11.5/contrib/emacs/git-blame.el --- old/git-1.7.11.4/contrib/emacs/git-blame.el 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/contrib/emacs/git-blame.el 2012-08-15 23:54:28.000000000 +0200 @@ -304,7 +304,7 @@ (defun git-blame-cleanup () "Remove all blame properties" - (mapcar 'delete-overlay git-blame-overlays) + (mapc 'delete-overlay git-blame-overlays) (setq git-blame-overlays nil) (remove-git-blame-text-properties (point-min) (point-max))) @@ -337,16 +337,16 @@ (defvar in-blame-filter nil) (defun git-blame-filter (proc str) - (save-excursion - (set-buffer (process-buffer proc)) - (goto-char (process-mark proc)) - (insert-before-markers str) - (goto-char 0) - (unless in-blame-filter - (let ((more t) - (in-blame-filter t)) - (while more - (setq more (git-blame-parse))))))) + (with-current-buffer (process-buffer proc) + (save-excursion + (goto-char (process-mark proc)) + (insert-before-markers str) + (goto-char (point-min)) + (unless in-blame-filter + (let ((more t) + (in-blame-filter t)) + (while more + (setq more (git-blame-parse)))))))) (defun git-blame-parse () (cond ((looking-at "\\([0-9a-f]\\{40\\}\\) \\([0-9]+\\) \\([0-9]+\\) \\([0-9]+\\)\n") @@ -385,32 +385,33 @@ info)))) (defun git-blame-create-overlay (info start-line num-lines) - (save-excursion - (set-buffer git-blame-file) - (let ((inhibit-point-motion-hooks t) - (inhibit-modification-hooks t)) - (goto-line start-line) - (let* ((start (point)) - (end (progn (forward-line num-lines) (point))) - (ovl (make-overlay start end)) - (hash (car info)) - (spec `((?h . ,(substring hash 0 6)) - (?H . ,hash) - (?a . ,(git-blame-get-info info 'author)) - (?A . ,(git-blame-get-info info 'author-mail)) - (?c . ,(git-blame-get-info info 'committer)) - (?C . ,(git-blame-get-info info 'committer-mail)) - (?s . ,(git-blame-get-info info 'summary))))) - (push ovl git-blame-overlays) - (overlay-put ovl 'git-blame info) - (overlay-put ovl 'help-echo - (format-spec git-blame-mouseover-format spec)) - (if git-blame-use-colors - (overlay-put ovl 'face (list :background - (cdr (assq 'color (cdr info)))))) - (overlay-put ovl 'line-prefix - (propertize (format-spec git-blame-prefix-format spec) - 'face 'git-blame-prefix-face)))))) + (with-current-buffer git-blame-file + (save-excursion + (let ((inhibit-point-motion-hooks t) + (inhibit-modification-hooks t)) + (goto-char (point-min)) + (forward-line (1- start-line)) + (let* ((start (point)) + (end (progn (forward-line num-lines) (point))) + (ovl (make-overlay start end)) + (hash (car info)) + (spec `((?h . ,(substring hash 0 6)) + (?H . ,hash) + (?a . ,(git-blame-get-info info 'author)) + (?A . ,(git-blame-get-info info 'author-mail)) + (?c . ,(git-blame-get-info info 'committer)) + (?C . ,(git-blame-get-info info 'committer-mail)) + (?s . ,(git-blame-get-info info 'summary))))) + (push ovl git-blame-overlays) + (overlay-put ovl 'git-blame info) + (overlay-put ovl 'help-echo + (format-spec git-blame-mouseover-format spec)) + (if git-blame-use-colors + (overlay-put ovl 'face (list :background + (cdr (assq 'color (cdr info)))))) + (overlay-put ovl 'line-prefix + (propertize (format-spec git-blame-prefix-format spec) + 'face 'git-blame-prefix-face))))))) (defun git-blame-add-info (info key value) (nconc info (list (cons (intern key) value)))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/git-mergetool--lib.sh new/git-1.7.11.5/git-mergetool--lib.sh --- old/git-1.7.11.4/git-mergetool--lib.sh 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/git-mergetool--lib.sh 2012-08-15 23:54:28.000000000 +0200 @@ -111,7 +111,7 @@ return $status } -guess_merge_tool () { +list_merge_tool_candidates () { if merge_mode then tools="tortoisemerge" @@ -136,6 +136,10 @@ tools="$tools emerge vimdiff" ;; esac +} + +guess_merge_tool () { + list_merge_tool_candidates echo >&2 "merge tool candidates: $tools" # Loop over each candidate and stop when a valid merge tool is found. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/git-mergetool.sh new/git-1.7.11.5/git-mergetool.sh --- old/git-1.7.11.4/git-mergetool.sh 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/git-mergetool.sh 2012-08-15 23:54:28.000000000 +0200 @@ -8,7 +8,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...' +USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...' SUBDIRECTORY_OK=Yes OPTIONS_SPEC= TOOL_MODE=merge @@ -284,11 +284,51 @@ return 0 } +show_tool_help () { + TOOL_MODE=merge + list_merge_tool_candidates + unavailable= available= LF=' +' + for i in $tools + do + merge_tool_path=$(translate_merge_tool_path "$i") + if type "$merge_tool_path" >/dev/null 2>&1 + then + available="$available$i$LF" + else + unavailable="$unavailable$i$LF" + fi + done + if test -n "$available" + then + echo "'git mergetool --tool=<tool>' may be set to one of the following:" + echo "$available" | sort | sed -e 's/^/ /' + else + echo "No suitable tool for 'git mergetool --tool=<tool>' found." + fi + if test -n "$unavailable" + then + echo + echo 'The following tools are valid, but not currently available:' + echo "$unavailable" | sort | sed -e 's/^/ /' + fi + if test -n "$unavailable$available" + then + echo + echo "Some of the tools listed above only work in a windowed" + echo "environment. If run in a terminal-only session, they will fail." + fi + exit 0 +} + prompt=$(git config --bool mergetool.prompt || echo true) while test $# != 0 do case "$1" in + --tool-help) + show_tool_help + ;; -t|--tool*) case "$#,$1" in *,*=*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/git.spec new/git-1.7.11.5/git.spec --- old/git-1.7.11.4/git.spec 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/git.spec 2012-08-15 23:54:29.000000000 +0200 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.7.11.4 +Version: 1.7.11.5 Release: 1%{?dist} Summary: Core git tools License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/sha1_file.c new/git-1.7.11.5/sha1_file.c --- old/git-1.7.11.4/sha1_file.c 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/sha1_file.c 2012-08-15 23:54:28.000000000 +0200 @@ -298,7 +298,7 @@ return -1; } } - if (!memcmp(ent->base, objdir, pfxlen)) { + if (!strcmp(ent->base, objdir)) { free(ent); return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/t/t7810-grep.sh new/git-1.7.11.5/t/t7810-grep.sh --- old/git-1.7.11.4/t/t7810-grep.sh 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/t/t7810-grep.sh 2012-08-15 23:54:28.000000000 +0200 @@ -399,17 +399,6 @@ test_cmp empty actual ' -# Create 1024 file names that sort between "y" and "z" to make sure -# the two files are handled by different calls to an external grep. -# This depends on MAXARGS in builtin-grep.c being 1024 or less. -c32="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v" -test_expect_success 'grep -C1, hunk mark between files' ' - for a in $c32; do for b in $c32; do : >y-$a$b; done; done && - git add y-?? && - git grep -C1 "^[yz]" >actual && - test_cmp expected actual -' - test_expect_success 'grep -C1 hunk mark between files' ' git grep -C1 "^[yz]" >actual && test_cmp expected actual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.7.11.4/version new/git-1.7.11.5/version --- old/git-1.7.11.4/version 2012-07-30 22:50:38.000000000 +0200 +++ new/git-1.7.11.5/version 2012-08-15 23:54:29.000000000 +0200 @@ -1 +1 @@ -1.7.11.4 +1.7.11.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
