diff options
| -rw-r--r-- | Documentation/RelNotes/2.0.0.txt | 18 | ||||
| -rwxr-xr-x | git-p4.py | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt index e6911ac..6e628d4 100644 --- a/Documentation/RelNotes/2.0.0.txt +++ b/Documentation/RelNotes/2.0.0.txt @@ -68,7 +68,7 @@ UI, Workflows & Features e.g. "key-id" in "--gpg-sign=<key-id>"). * The pattern to find where the function begins in C/C++ used in - "diff" and "grep -p" have been updated to help C++ source better. + "diff" and "grep -p" has been updated to help C++ source better. * "git rebase" learned to interpret a lone "-" as "@{-1}", the branch that we were previously on. @@ -89,8 +89,8 @@ UI, Workflows & Features "-h" (no header) and "-c" (count) options are given. * "git push" via transport-helper interface (e.g. remote-hg) has - been updated to allow ref deletion in a way similar to the natively - supported transports. + been updated to allow forced ref updates in a way similar to the + natively supported transports. * The "simple" mode is the default for "git push". @@ -98,7 +98,7 @@ UI, Workflows & Features tree-wide operation even when run inside a subdirectory of a working tree. - * "git add <path> is the same as "git add -A <path>" now. + * "git add <path>" is the same as "git add -A <path>" now. * "core.statinfo" configuration variable, which is a never-advertised synonym to "core.checkstat", has been removed. @@ -137,7 +137,7 @@ UI, Workflows & Features * "git pull" can be told to only accept fast-forward by setting the new "pull.ff" configuration. - * "git reset" learned "-N" option, which does not reset the index + * "git reset" learned the "-N" option, which does not reset the index fully for paths the index knows about but the tree-ish the command resets to does not (these paths are kept as intend-to-add entries). @@ -156,11 +156,11 @@ Performance, Internal Implementation, etc. "easy" interface. * The bitmap-index feature from JGit has been ported, which should - significantly improve performance when serving objects form a + significantly improve performance when serving objects from a repository that uses it. * The way "git log --cc" shows a combined diff against multiple - parents have been optimized. + parents has been optimized. * The prefixcmp() and suffixcmp() functions are gone. Use starts_with() and ends_with(), and also consider if skip_prefix() @@ -179,6 +179,10 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance track are contained in this release (see the maintenance releases' notes for details). + * "git p4" was broken in 1.9 release to deal with changes in binary + files. + (merge 749b668 cl/p4-use-diff-tree later to maint). + * The shell prompt script (in contrib/), when using the PROMPT_COMMAND interface, used an unsafe construct when showing the branch name in $PS1. @@ -1311,7 +1311,7 @@ class P4Submit(Command, P4UserMap): else: die("unknown modifier %s for %s" % (modifier, path)) - diffcmd = "git diff-tree -p \"%s\"" % (id) + diffcmd = "git diff-tree --full-index -p \"%s\"" % (id) patchcmd = diffcmd + " | git apply " tryPatchCmd = patchcmd + "--check -" applyPatchCmd = patchcmd + "--check --apply -" |