1Git v1.7.10 Release Notes 2========================= 3 4Compatibility Notes 5------------------- 6 7 * From this release on, the "git merge" command in an interactive 8 session will start an editor when it automatically resolves the 9 merge for the user to explain the resulting commit, just like the 10 "git commit" command does when it wasn't given a commit message. 11 12 If you have a script that runs "git merge" and keeps its standard 13 input and output attached to the user's terminal, and if you do not 14 want the user to explain the resulting merge commits, you can 15 export GIT_MERGE_AUTOEDIT environment variable set to "no", like 16 this: 17 18 #!/bin/sh 19 GIT_MERGE_AUTOEDIT=no 20 export GIT_MERGE_AUTOEDIT 21 22 to disable this behaviour (if you want your users to explain their 23 merge commits, you do not have to do anything). Alternatively, you 24 can give the "--no-edit" option to individual invocations of the 25 "git merge" command if you know everybody who uses your script has 26 Git v1.7.8 or newer. 27 28 * The "--binary/-b" options to "git am" have been a no-op for quite a 29 while and were deprecated in mid 2008 (v1.6.0). When you give these 30 options to "git am", it will now warn and ask you not to use them. 31 32 * When you do not tell which branches and tags to push to the "git push" 33 command in any way, the command used "matching refs" rule to update 34 remote branches and tags with branches and tags with the same name you 35 locally have. In future versions of Git, this will change to push out 36 only your current branch according to either the "upstream" or the 37 "current" rule. Although "upstream" may be more powerful once the 38 user understands Git better, the semantics "current" gives is 39 simpler and easier to understand for beginners and may be a safer 40 and better default option, but we haven't decided yet. 41 42 43Updates since v1.7.9 44-------------------- 45 46UI, Workflows & Features 47 48 * various "gitk" updates. 49 - show the path to the top level directory in the window title 50 - update preference edit dialog 51 - display file list correctly when directories are given on command line 52 - make "git-describe" output in the log message into a clickable link 53 - avoid matching the UNIX timestamp part when searching all fields 54 - give preference to symbolic font names like sans & monospace 55 - allow comparing two commits using a mark 56 - "gitk" honors log.showroot configuration. 57 58 * Teams for localizing the messages from the Porcelain layer of 59 commands are starting to form, thanks to Jiang Xin who volunteered 60 to be the localization coordinator. Translated messages for 61 simplified Chinese, Swedish and Portuguese are available. 62 63 * The configuration mechanism learned an "include" facility; an 64 assignment to the include.path pseudo-variable causes the named 65 file to be included in-place when Git looks up configuration 66 variables. 67 68 * A content filter (clean/smudge) used to be just a way to make the 69 recorded contents "more useful", and allowed to fail; a filter can 70 now optionally be marked as "required". 71 72 * Options whose names begin with "--no-" (e.g. the "--no-verify" 73 option of the "git commit" command) can be negated by omitting 74 "no-" from its name, e.g. "git commit --verify". 75 76 * "git am" learned to pass "-b" option to underlying "git mailinfo", so 77 that a bracketed string other than "PATCH" at the beginning can be kept. 78 79 * "git clone" learned "--single-branch" option to limit cloning to a 80 single branch (surprise!); tags that do not point into the history 81 of the branch are not fetched. 82 83 * "git clone" learned to detach the HEAD in the resulting repository 84 when the user specifies a tag with "--branch" (e.g., "--branch=v1.0"). 85 Clone also learned to print the usual "detached HEAD" advice in such 86 a case, similar to "git checkout v1.0". 87 88 * When showing a patch while ignoring whitespace changes, the context 89 lines are taken from the postimage, in order to make it easier to 90 view the output. 91 92 * "git diff --stat" learned to adjust the width of the output on 93 wider terminals, and give more columns to pathnames as needed. 94 95 * "diff-highlight" filter (in contrib/) was updated to produce more 96 aesthetically pleasing output. 97 98 * "fsck" learned "--no-dangling" option to omit dangling object 99 information. 100 101 * "git log -G" and "git log -S" learned to pay attention to the "-i" 102 option. With "-i", "log -G" ignores the case when finding patch 103 hunks that introduce or remove a string that matches the given 104 pattern. Similarly with "-i", "log -S" ignores the case when 105 finding the commit the given block of text appears or disappears 106 from the file. 107 108 * "git merge" in an interactive session learned to spawn the editor 109 by default to let the user edit the auto-generated merge message, 110 to encourage people to explain their merges better. Legacy scripts 111 can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior. 112 Both "git merge" and "git pull" can be given --no-edit from the 113 command line to accept the auto-generated merge message. 114 115 * The advice message given when the user didn't give enough clue on 116 what to merge to "git pull" and "git merge" has been updated to 117 be more concise and easier to understand. 118 119 * "git push" learned the "--prune" option, similar to "git fetch". 120 121 * The whole directory that houses a top-level superproject managed by 122 "git submodule" can be moved to another place. 123 124 * "git symbolic-ref" learned the "--short" option to abbreviate the 125 refname it shows unambiguously. 126 127 * "git tag --list" can be given "--points-at <object>" to limit its 128 output to those that point at the given object. 129 130 * "gitweb" allows intermediate entries in the directory hierarchy 131 that leads to a project to be clicked, which in turn shows the 132 list of projects inside that directory. 133 134 * "gitweb" learned to read various pieces of information for the 135 repositories lazily, instead of reading everything that could be 136 needed (including the ones that are not necessary for a specific 137 task). 138 139 * Project search in "gitweb" shows the substring that matched in the 140 project name and description highlighted. 141 142 * A new script "diffall" is added to contrib/; it drives an 143 external tool to perform a directory diff of two Git revisions 144 in one go, unlike "difftool" that compares one file at a time. 145 146Foreign Interface 147 148 * Improved handling of views, labels and branches in "git-p4" (in contrib). 149 150 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when 151 p4 expanded the embedded $RCS$-like keywords; it can be now told to 152 unexpand them. 153 154 * Some "git-svn" updates. 155 156 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and 157 support incremental imports. 158 159 * "git difftool/mergetool" learned to drive DeltaWalker. 160 161Performance 162 163 * Unnecessary calls to parse_object() "git upload-pack" makes in 164 response to "git fetch", have been eliminated, to help performance 165 in repositories with excessive number of refs. 166 167Internal Implementation (please report possible regressions) 168 169 * Recursive call chains in "git index-pack" to deal with long delta 170 chains have been flattened, to reduce the stack footprint. 171 172 * Use of add_extra_ref() API is now gone, to make it possible to 173 cleanly restructure the overall refs API. 174 175 * The command line parser of "git pack-objects" now uses parse-options 176 API. 177 178 * The test suite supports the new "test_pause" helper function. 179 180 * Parallel to the test suite, there is a beginning of performance 181 benchmarking framework. 182 183 * t/Makefile is adjusted to prevent newer versions of GNU make from 184 running tests in seemingly random order. 185 186 * The code to check if a path points at a file beyond a symbolic link 187 has been restructured to be thread-safe. 188 189 * When pruning directories that has become empty during "git prune" 190 and "git prune-packed", call closedir() that iterates over a 191 directory before rmdir() it. 192 193Also contains minor documentation updates and code clean-ups. 194 195 196Fixes since v1.7.9 197------------------ 198 199Unless otherwise noted, all the fixes since v1.7.9 in the maintenance 200releases are contained in this release (see release notes to them for 201details). 202 203 * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work 204 with versions of Perl older than 5.8.3. 205 (merge 5eb660e ab/perl-i18n later to maint). 206 207 * "git tag -s" honored "gpg.program" configuration variable since 208 1.7.9, but "git tag -v" and "git verify-tag" didn't. 209 (merge a2c2506 az/verify-tag-use-gpg-config later to maint). 210 211 * "configure" script learned to take "--with-sane-tool-path" from the 212 command line to record SANE_TOOL_PATH (used to avoid broken platform 213 tools in /usr/bin) in config.mak.autogen. This may be useful for 214 people on Solaris who have saner tools outside /usr/xpg[46]/bin. 215 216 * zsh port of bash completion script needed another workaround.