From 2a6f08ac1f6949ed0072aed3240bc04d80051851 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 15 Aug 2011 17:13:07 -0700 Subject: [PATCH 1/2] am: refresh the index at start and --resolved If a file is unchanged but stat-dirty, we may erroneously fail to apply patches, thinking that they conflict with a dirty working tree. This patch adds a call to "update-index --refresh". It comes as late as possible, so that we don't bother with it for thinks like "git rebase --abort", or when mbox-splitting fails. However, it does come before we actually start applying patches, meaning we will only call it once when we start applying patches (or any time we return to "am" after having resolved conflicts), and not once per patch. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- git-am.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-am.sh b/git-am.sh index 6cdd5910db..f1a03c9128 100755 --- a/git-am.sh +++ b/git-am.sh @@ -507,6 +507,8 @@ else fi fi +git update-index -q --refresh + case "$resolved" in '') case "$HAS_HEAD" in From 8499644ea7af87c02f9b878f162aa6facbd5b8a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 16 Aug 2011 12:13:38 -0700 Subject: [PATCH 2/2] Prepare for 1.7.6.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.6.1.txt | 52 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.6.1.txt diff --git a/Documentation/RelNotes/1.7.6.1.txt b/Documentation/RelNotes/1.7.6.1.txt new file mode 100644 index 0000000000..95905e48f8 --- /dev/null +++ b/Documentation/RelNotes/1.7.6.1.txt @@ -0,0 +1,52 @@ +Git v1.7.6.1 Release Notes +========================== + +Fixes since v1.7.6 +------------------ + + * Various codepaths that invoked zlib deflate/inflate assumed that these + functions can compress or uncompress more than 4GB data in one call on + platforms with 64-bit long, which has been corrected. + + * "git unexecutable" reported that "unexecutable" was not found, even + though the actual error was that "unexecutable" was found but did + not have a proper she-bang line to be executed. + + * "git checkout -b " was confused when attempting to create a + branch whose name ends with "-g" followed by hexadecimal digits, + and refused to work. + + * "git checkout -b " sometimes wrote a bogus reflog entry, + causing later "git checkout -" to fail. + + * "git diff --cc" learned to correctly ignore binary files. + + * "git fast-export" forgot to quote pathnames with unsafe characters + in its output. + + * "git fetch" did not recurse into submodules in subdirectories. + + * "git ls-tree" did not error out when asked to show a corrupt tree. + + * "git pull" without any argument left an extra whitespace after the + command name in its reflog. + + * "git rebase -i -p" incorrectly dropped commits from side branches. + + * "git reset [] paths..." did not reset the index entry correctly + for unmerged paths. + + * "git submodule add" did not allow a relative repository path when + the superproject did not have any default remote url. + + * "git submodule foreach" failed to correctly give the standard input to + the user-supplied command it invoked. + + * submodules that the user has never showed interest in by running + "git submodule init" was incorrectly marked as interesting by "git + submodule sync". + + * "git submodule update --quiet" was not really quiet. + + * "git tag -l ..." did not take multiple glob patterns from the + command line. diff --git a/RelNotes b/RelNotes index 5fcc4ef747..5a33236ce9 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.6.txt \ No newline at end of file +Documentation/RelNotes/1.7.6.1.txt \ No newline at end of file