From d02244360465f5748fc85e7bc111dbc6269691da Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Wed, 4 May 2011 21:58:17 +0200 Subject: [PATCH 1/3] git-add.txt: document 'add.ignoreErrors' Signed-off-by: Valentin Haenel Noticed-by: Junio C Hamano Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 7eebbefe7b..35cb5d3f64 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -134,6 +134,8 @@ subdirectories. If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. + The configuration variable `add.ignoreErrors` can be set to + true to make this the default behaviour. --ignore-missing:: This option can only be used together with --dry-run. By using From 2f312e8851035a85f431911075383265f1519c04 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 4 May 2011 15:47:40 -0700 Subject: [PATCH 2/3] Git 1.7.5.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.1.txt | 33 ++++++++++++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.5.1.txt b/Documentation/RelNotes/1.7.5.1.txt index cfd9b2aa22..c6ebd76d19 100644 --- a/Documentation/RelNotes/1.7.5.1.txt +++ b/Documentation/RelNotes/1.7.5.1.txt @@ -4,9 +4,42 @@ Git v1.7.5.1 Release Notes Fixes since v1.7.5 ------------------ + * When an object "$tree:$path" does not exist, if $path does exist in the + subtree of $tree that corresponds to the subdirectory the user is in, + git now suggests using "$tree:./$path" in addition to the advice to use + the full path from the root of the working tree. + * The "--date=relative" output format used to say "X years, 12 months" when it should have said "X+1 years". + * The smart-HTTP transfer was broken in 1.7.5 when the client needs + to issue a small POST (which uses content-length) and then a large + POST (which uses chunked) back to back. + + * "git clean" used to fail on an empty directory that is not readable, + even though rmdir(2) could remove such a directory. Now we attempt it + as the last resort. + + * The "--dirstat" option of "diff" family of commands used to totally + ignore a change that only rearranged lines within a file. Such a + change now counts as at least a minimum but non zero change. + + * The "--dirstat" option of "diff" family of commands used to use the + pathname in the original, instead of the pathname in the result, + when renames are involved. + + * "git pack-object" did not take core.bigfilethreashold into account + (unlike fast-import); now it does. + + * "git reflog" ignored options like "--format=.." on the command line. + + * "git stash apply" used to refuse to work if there was any change in + the working tree, even when the change did not overlap with the change + the stash recorded. + + * "git stash apply @{99999}" was not diagnosed as an error, even when you + did not have that many stash entries. + * An error message from "git send-email" to diagnose a broken SMTP connection configuration lacked a space between "hello=" and "port=". diff --git a/Documentation/git.txt b/Documentation/git.txt index 9d5949229a..78420b133a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.5/git.html[documentation for release 1.7.5] +* link:v1.7.5.1/git.html[documentation for release 1.7.5.1] * release notes for + link:RelNotes/1.7.5.1.txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]. * link:v1.7.4.5/git.html[documentation for release 1.7.4.5] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 68691b3c12..38ecb5314d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.5 +DEF_VER=v1.7.5.1 LF=' ' From 505a138cbd5c45d890d180383c8bd808ee8105aa Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 4 May 2011 16:02:17 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.6.txt | 40 +++++++++++--------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index fbbc5b447e..9945ac9ef2 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -9,18 +9,9 @@ Updates since v1.7.5 * Clean-up of the C part of i18n (but not l10n---please wait) continues. - * When an object "$tree:$path" does not exist, if $path does exist in the - subtree of $tree that corresponds to the subdirectory the user is in, - git now suggests using "$tree:./$path" in addition to the advice to use - the full path from the root of the working tree. - * "git blame" learned "--abbrev[=]" option to control the minimum number of hexdigits shown for commit object names. - * "git clean" used to fail on an empty directory that is not readable, - even though rmdir(2) could remove such a directory. Now we attempt it - as the last resort. - * "git diff -C -C" used to disable the rename detection entirely when there are too many copy candidate paths in the tree; now it falls back to "-C" when doing so would keep the copy candidate paths @@ -36,19 +27,15 @@ Updates since v1.7.5 * "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works. - * "git pack-object" now takes core.bigfilethreashold into account, just - like fast-imoprt does. - - * "git reflog" allows options like "--format=.." to be given. - - * "git stash apply" can now apply to a working tree with changes as long - as there is no overlapping change as the stash being applied. + * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked + commits separately, producing more a useful output. * "git submodule update" learned "--force" option to get rid of local changes in submodules and replace them with the up-to-date version. - * "git stash apply @{99999}" now is diagnosed as an error, unless you - really have that many stash entries. + * Compressed tarball gitweb generates is made without the timestamp of + the tarball generation; snapshot from the same tree should result in + a same tarball. Also contains various documentation updates. @@ -62,15 +49,6 @@ included in this release. * "git config" used to choke with an insanely long line. (merge ef/maint-strbuf-init later) - * The "--dirstat" option of "diff" family of commands used to totally - ignore a change that only rearranged lines within a file. Such a - change now counts as at least a minimum but non zero change. - - * The "--dirstat" option of "diff" family of commands used to use the - pathname in the original, instead of the pathname in the result, - when renames are involved. - (merge jh/dirstat for the above two later) - * "diff -M --cached" used to use unmerged path as a possible rename source candidate, which made no sense. (merge mz/maint-rename-unmerged later) @@ -79,6 +57,14 @@ included in this release. nonsense result that consists of alternating empty output. (merge early part of cn/format-patch-quiet later) + * "git format-patch" did not quote RFC822 special characters in the + email address (e.g From: Junio C. Hamano , not + From: "Junio C. Hamano" ). + (merge jk/format-patch-quote-special-in-from later) + + * "git mergetool" did not handle conflicted submoudules gracefully. + (merge jm/mergetool-submodules later) + * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now mean the same thing. (merge dm/stash-k-i-p later)