From 5bda18c186e455f8e65f976d3bf333ab1f4b5b53 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Apr 2013 15:27:23 -0700
Subject: [PATCH] Git 1.8.2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/1.8.2.1.txt | 5 +++++
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt
index 1ded500fc34..1354ad03f5e 100644
--- a/Documentation/RelNotes/1.8.2.1.txt
+++ b/Documentation/RelNotes/1.8.2.1.txt
@@ -4,6 +4,11 @@ Git v1.8.2.1 Release Notes
Fixes since v1.8.2
------------------
+ * An earlier change to the attribute system introduced at v1.8.1.2 by
+ mistake stopped a pattern "dir" (without trailing slash) from
+ matching a directory "dir" (it only wanted to allow pattern "dir/"
+ to also match).
+
* Verification of signed tags were not done correctly when not in C
or en/US locale.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5a6178820d7..6a875f2adef 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,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.8.2/git.html[documentation for release 1.8.2]
+* link:v1.8.2.1/git.html[documentation for release 1.8.2.1]
* release notes for
+ link:RelNotes/1.8.2.1.txt[1.8.2.1].
link:RelNotes/1.8.2.txt[1.8.2].
* link:v1.8.1.6/git.html[documentation for release 1.8.1.6]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f189b7889e7..26422bfc22e 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.2
+DEF_VER=v1.8.2.1
LF='
'