1Git v1.7.11 Release Notes 2========================= 3 4Updates since v1.7.10 5--------------------- 6 7UI, Workflows & Features 8 9 * A new mode for push, "simple", which is a cross between "current" 10 and "upstream", has been introduced. "git push" without any refspec 11 will push the current branch out to the same name at the remote 12 repository only when it is set to track the branch with the same 13 name over there. The plan is to make this mode the new default 14 value when push.default is not configured. 15 16 * A third-party tool "git subtree" is distributed in contrib/ 17 18 * Error messages given when @{u} is used for a branch without its 19 upstream configured have been clatified. 20 21 * Even with "-q"uiet option, "checkout" used to report setting up 22 tracking. Also "branch" learned the "-q"uiet option to squelch 23 informational message. 24 25 * The smart-http backend used to always override GIT_COMMITTER_* 26 variables with REMOTE_USER and REMOTE_ADDR, but these variables are 27 now preserved when set. 28 29 * "include.path" mechanism of the configuration files learned to 30 understand "~/path" and "~user/path". 31 32 * "git am" learned the "--include" option, which is an opposite of 33 existing the "--exclude" option. 34 35 * When "git am -3" needs to fall back to an application to a 36 synthesized preimage followed by a 3-way merge, the paths that 37 needed such treatment are now reported to the end user, so that the 38 result in them can be eyeballed with extra care. 39 40 * The output from "diff/log --stat" used to always allocate 4 columns 41 to show the number of modified lines, but not anymore. 42 43 * The "fmt-merge-msg" command learns to list the primary contributors 44 involved in the side topic you are merging. 45 46 * The cases "git push" fails due to non-ff can be broken into three 47 categories; each case is given a separate advise message. 48 49 * "git rebase" learned to optionally keep commits that do not 50 introduce any change in the original history. 51 52 * "git push --recurse-submodules" learned to optionally look into the 53 histories of submodules bound to the superproject and push them 54 out. 55 56 * A 'snapshot' request to "gitweb" honors If-Modified-Since: header, 57 based on the commit date. 58 59 * "gitweb" learned to highlight the patch it outputs even more. 60 61Foreign Interface 62 63 * "git svn" used to die with unwanted SIGPIPE when talking with HTTP 64 server that uses keep-alive. 65 66 * "git svn" learned to use platform specific authentication 67 providers, e.g. gnome-keyring, kwallet, etc. 68 69 * "git p4" has been moved out of contrib/ area and has seen more work 70 on importing labels as tags from (and exporting tags as labels to) 71 p4. 72 73Performance and Internal Implementation (please report possible regressions) 74 75 * An experimental "version 4" format of the index file has been 76 introduced to reduce on-disk footprint and I/O overhead. 77 78 * The code to compute hash values for lines used by the internal diff 79 engine was optimized on little-endian machines, using the same 80 trick the kernel folks came up with. 81 82 * "git apply" had some memory leaks plugged. 83 84 * "git repack" used to write out unreachable objects as loose objects 85 when repacking, even if such loose objects will immediately pruned 86 due to its age. 87 88 * Setting up a revision traversal with many starting points was 89 inefficient as these were placed in a date-order priority queue 90 one-by-one. Now they are collected in the queue unordered first, 91 and sorted immediately before getting used. 92 93 * "git rev-parse --show-prefix" used to emit nothing when run at the 94 top-level of the working tree, but now it gives a blank line. 95 96 * Minor memory leak during unpack_trees (hence "merge" and "checkout" 97 to check out another branch) has been plugged. 98 99 * More lower-level commands learned to use the streaming API to read 100 from the object store without keeping everything in core. 101 102 * Because "sh" on the user's PATH may be utterly broken on some 103 systems, run-command API now uses SHELL_PATH, not /bin/sh, when 104 spawning an external command (not applicable to Windows port). 105 106 * The API to iterate over refs/ hierarchy has been tweaked to allow 107 walking only a subset of it more efficiently. 108 109Also contains minor documentation updates and code clean-ups. 110 111 112Fixes since v1.7.10 113------------------- 114 115Unless otherwise noted, all the fixes since v1.7.10 in the maintenance 116releases are contained in this release (see release notes to them for 117details). 118 119 * When using a Perl script on a system where "perl" found on user's 120 $PATH could be ancient or otherwise broken, we allow builders to 121 specify the path to a good copy of Perl with $PERL_PATH. The 122 gitweb test forgot to use that Perl when running its test. 123 (merge 0754e08 jk/maint-gitweb-test-use-sane-perl later to maint). 124 125 * A contrib script "rerere-train" did not work out of the box unless 126 user futzed with her $PATH. 127 (merge 53876fc jc/rerere-train later to maint). 128 129 * "log --graph" was not very friendly with "--stat" option and its 130 output had line breaks at wrong places. 131 (merge bafa16e lp/diffstat-with-graph later to maint). 132 133 * "git config --rename-section" to rename an existing section into a 134 bogus one did not check the new name. 135 (merge 94a35b1 jk/maint-config-bogus-section later to maint). 136 137 * The test scaffolding for git-daemon was flaky. 138 (merge 46e3581 js/daemon-test-race-fix later to maint). 139 140 * The test scaffolding for fast-import was flaky. 141 (merge 7fb8e16 pw/t5800-import-race-fix later to maint). 142 143 * Octopus merge strategy did not reduce heads that are recorded in the 144 final commit correctly. 145 (merge 5802f81 jc/merge-reduce-parents-early later to maint). 146 147 * In the older days, the header "Conflicts:" in "cherry-pick" and 148 "merge" was separated by a blank line from the list of paths that 149 follow for readability, but when "merge" was rewritten in C, we lost 150 it by mistake. Remove the newline from "cherry-pick" to make them 151 match again. 152 (merge 5112068 rt/cherry-revert-conflict-summary later to maint). 153 154 * The filesystem boundary was not correctly reported when .git 155 directory discovery stopped at a mount point. 156 (merge 2565b43 cb/maint-report-mount-point-correctly-in-setup later to maint). 157 158 * The command line parser choked "git cherry-pick $name" when $name 159 can be both revision name and a pathname, even though $name can 160 never be a path in the context of the command. 161 (merge 6d5b93f cb/cherry-pick-rev-path-confusion later to maint). 162 163 * HTTP transport that requires authentication did not work correctly 164 when multiple connections are used simultaneously. 165 (merge 6f4c347 cb/http-multi-curl-auth later to maint). 166 167 * The i18n of error message "git stash save" was not properly done. 168 (merge ed3c400 rl/maint-stash-i18n-save-error later to maint). 169 170 * The report from "git fetch" said "new branch" even for a non branch 171 ref. 172 (merge 0997ada mb/fetch-call-a-non-branch-a-ref later to maint). 173 174 * The "diff --no-index" codepath used limited-length buffers, risking 175 pathnames getting truncated. Update it to use the strbuf API. 176 (merge 875b91b jm/maint-strncpy-diff-no-index later to maint).