From c14f3727913a67835ad38d17edcbfe4e1c94e9a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 2 Apr 2011 23:08:13 -0700 Subject: [PATCH 1/2] Doc: mention --delta-base-offset is the default for Porcelain commands The underlying pack-objects plumbing command still needs an explicit option from the command line, but these days Porcelain passes the option, so there is no need for end users to worry about it anymore. Signed-off-by: Junio C Hamano --- Documentation/git-pack-objects.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index a9c373c7b5..96684bc510 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -192,13 +192,18 @@ self-contained. Use `git index-pack --fix-thin` --delta-base-offset:: A packed archive can express the base object of a delta as either a 20-byte object name or as an offset in the - stream, but older versions of git don't understand the + stream, but ancient versions of git don't understand the latter. By default, 'git pack-objects' only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain length, this option typically shrinks the resulting packfile by 3-5 per-cent. ++ +Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), +`git repack` (see linkgit:git-repack[1]) pass this option by default +in modern git when they put objects in your repository into pack files. +So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. --threads=:: Specifies the number of threads to spawn when searching for best From d83a831bf4eca748f159b326d5a2562085013900 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 3 Apr 2011 00:12:31 -0700 Subject: [PATCH 2/2] Git 1.7.4.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.4.3.txt | 32 ++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/1.7.4.3.txt diff --git a/Documentation/RelNotes/1.7.4.3.txt b/Documentation/RelNotes/1.7.4.3.txt new file mode 100644 index 0000000000..02a3d5bdf6 --- /dev/null +++ b/Documentation/RelNotes/1.7.4.3.txt @@ -0,0 +1,32 @@ +Git v1.7.4.3 Release Notes +========================== + +Fixes since v1.7.4.2 +-------------------- + + * "git apply" used to confuse lines updated by previous hunks as lines + that existed before when applying a hunk, contributing misapplication + of patches with offsets. + + * "git branch --track" (and "git checkout --track --branch") used to + allow setting up a random non-branch that does not make sense to follow + as the "upstream". The command correctly diagnoses it as an error. + + * "git checkout $other_branch" silently removed untracked symbolic links + in the working tree that are in the way in order to check out paths + under it from the named branch. + + * "git cvsimport" did not bail out immediately when the cvs server cannot + be reached, spewing unnecessary error messages that complain about the + server response that it never got. + + * "git diff --quiet" did not work very well with the "--diff-filter" + option. + + * "git grep -n" lacked a long-hand synonym --line-number. + + * "git stash apply" reported the result of its operation by running + "git status" from the top-level of the working tree; it should (and + now does) run it from the user's working directory. + +And other minor fixes and documentation updates. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0b4e960d98..cbd6e34644 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.4.2 +DEF_VER=v1.7.4.3 LF=' ' diff --git a/RelNotes b/RelNotes index 9a74955126..5d988d6ab7 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.4.2.txt \ No newline at end of file +Documentation/RelNotes/1.7.4.3.txt \ No newline at end of file