Documentation / RelNotes / 1.7.10.txton commit Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' (aa145bf)
   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
  29Updates since v1.7.9
  30--------------------
  31
  32UI, Workflows & Features
  33
  34 * Teams for localizing the messages from the Porcelain layer of
  35   commands are starting to form, thanks to Jiang Xin who volunteered
  36   to be the localization coordinator.  An initial set of translated
  37   messages for simplified chinese is available.
  38
  39 * The configuration mechanism learned an "include" facility; an
  40   assignment to the include.path pseudo-variable causes the named
  41   file to be included in-place when Git looks up configuration
  42   variables.
  43
  44 * A content filter (clean/smudge) used to be just a way to make the
  45   recorded contents "more useful", and allowed to fail; a filter can
  46   new optionally be marked as "required".
  47
  48 * Options whose names begin with "--no-" (e.g. the "--no-verify"
  49   option of the "git commit" command) can be negated by omitting
  50   "no-" from its name, e.g. "git commit --verify".
  51
  52 * "git am" learned to pass "-b" option to underlying "git mailinfo", so
  53   that bracketed string other than "PATCH" at the beginning can be kept.
  54
  55 * "git clone" learned "--single-branch" option to limit cloning to a
  56   single branch (surprise!).
  57
  58 * "git clone" learned to detach the HEAD in the resulting repository
  59   when the source repository's HEAD does not point to a branch.
  60
  61 * When showing a patch while ignoring whitespace changes, the context
  62   lines are taken from the postimage, in order to make it easier to
  63   view the output.
  64
  65 * "git diff --stat" learned to adjust the width of the output on
  66   wider terminals, and give more columns to pathnames as needed.
  67
  68 * "diff-highlight" filter (in contrib/) was updated to produce more
  69   aesthetically pleasing output.
  70
  71 * "fsck" learned "--no-dangling" option to omit dangling object
  72   information.
  73
  74 * "git log -G" learned to pay attention to the "-i" option and can
  75   find patch hunks that introduce or remove a string that matches the
  76   given pattern ignoring the case.
  77
  78 * "git merge" in an interactive session learned to spawn the editor
  79   by default to let the user edit the auto-generated merge message,
  80   to encourage people to explain their merges better. Legacy scripts
  81   can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior.
  82   Both "git merge" and "git pull" can be given --no-edit from the
  83   command line to accept the auto-generated merge message.
  84
  85 * The advise message given when the user didn't give enough clue on
  86   what to merge to "git pull" and "git merge" has been updated to
  87   be more concise and easier to understand.
  88
  89 * "git push" learned the "--prune" option, similar to "git fetch".
  90
  91 * "git symbolic-ref" learned the "--short" option to abbreviate the
  92   refname it shows unambiguously.
  93
  94 * "git tag --list" can be given "--points-at <object>" to limit its
  95   output to those that point at the given object.
  96
  97 * "gitweb" allows intermediate entries in the directory hierarchy
  98   that leads to a projects to be clicked, which in turn shows the
  99   list of projects inside that directory.
 100
 101 * "gitweb" learned to read various pieces of information for the
 102   repositories lazily, instead of reading everything that could be
 103   needed (including the ones that are not necessary for a specific
 104   task).
 105
 106 * Project search in "gitweb" shows the substring that matched in the
 107   project name and description highlighted.
 108
 109Foreign Interface
 110
 111 * Improved handling of views, labels and branches in "git-p4" (in contrib).
 112
 113 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
 114   p4 expanded the embedded $RCS$-like keywords; it can be now told to
 115   unexpand them.
 116
 117 * Some "git-svn" updates.
 118
 119 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
 120   support incremental imports.
 121
 122 * "git difftool/mergetool" learned to drive DeltaWalker.
 123
 124Performance
 125
 126 * Unnecessary calls to parse_object() "git upload-pack" makes in
 127   response to "git fetch", have been eliminated, to help performance
 128   in repositories with excessive number of refs.
 129
 130Internal Implementation (please report possible regressions)
 131
 132 * Recursive call chains in "git index-pack" to deal with long delta
 133   chains have been flattened, to reduce the stack footprint.
 134
 135 * Use of add_extra_ref() API is now gone, to make it possible to
 136   cleanly restructure the overall refs API.
 137
 138 * The command line parser of "git pack-objects" now uses parse-options
 139   API.
 140
 141 * The test suite supports the new "test_pause" helper function.
 142
 143 * Parallel to the test suite, there is a beginning of performance
 144   benchmarking framework.
 145
 146 * t/Makefile is adjusted to prevent newer versions of GNU make from
 147   running tests in seemingly random order.
 148
 149 * The code to check if a path points at a file beyond a symbolic link
 150   has been restructured to be thread-safe.
 151
 152Also contains minor documentation updates and code clean-ups.
 153
 154
 155Fixes since v1.7.9
 156------------------
 157
 158Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
 159releases are contained in this release (see release notes to them for
 160details).
 161
 162 * "git bundle" did not record boundary commits correctly when there
 163   are many of them.
 164   (merge efe4be1 tr/maint-bundle-boundary later to maint).
 165
 166 * "git diff-index" and its friends at the plumbing level showed the
 167   "diff --git" header and nothing else for a path whose cached stat
 168   info is dirty without actual difference when asked to produce a
 169   patch. This was a longstanding bug that we could have fixed long
 170   time ago.
 171   (merge b3f01ff jc/maint-diff-patch-header later to maint).
 172
 173 * The code to synthesize the fake ancestor tree used by 3-way merge
 174   fallback in "git am" was not prepared to read a patch created with
 175   a non-standard -p<num> value.
 176   (merge a61ba26 jc/am-3-nonstandard-popt later to maint).
 177
 178 * "gitweb" used to drop warnings in the log file when "heads" view is
 179   accessed in a repository whose HEAD does not point at a valid
 180   branch.
 181
 182---
 183exec >/var/tmp/1
 184O=v1.7.9.3-366-g1e4d087
 185echo O=$(git describe)
 186git log --first-parent --oneline ^maint $O..
 187echo
 188git shortlog --no-merges ^maint $O..