aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-08 22:46:56 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-08 22:46:56 -0700
commit4662231e5654924c78fcb4b630fb48c58b945b7f (patch)
tree2a97cbf7bd28851523f2861db51db98bfe9d91eb
parenta42cbacc1133f57de23734e5d52324208606806e (diff)
parent1cc202bd4ebd0390d738f0d633d42791cb79dd05 (diff)
downloadgit-4662231e5654924c78fcb4b630fb48c58b945b7f.tar.gz
git-4662231e5654924c78fcb4b630fb48c58b945b7f.tar.xz
Merge branch 'maint'
* maint: GIT v1.5.1.4 Add howto files to rpm packages. wcwidth redeclaration user-manual: fix clone and fetch typos
-rw-r--r--Documentation/RelNotes-1.5.1.4.txt30
-rw-r--r--Documentation/user-manual.txt13
-rw-r--r--git.spec.in5
-rw-r--r--utf8.c4
4 files changed, 42 insertions, 10 deletions
diff --git a/Documentation/RelNotes-1.5.1.4.txt b/Documentation/RelNotes-1.5.1.4.txt
new file mode 100644
index 000000000..df2f66ccb
--- /dev/null
+++ b/Documentation/RelNotes-1.5.1.4.txt
@@ -0,0 +1,30 @@
+GIT v1.5.1.4 Release Notes
+==========================
+
+Fixes since v1.5.1.3
+--------------------
+
+* Bugfixes
+
+ - "git-http-fetch" did not work around a bug in libcurl
+ earlier than 7.16 (curl_multi_remove_handle() was broken).
+
+ - "git cvsserver" handles a file that was once removed and
+ then added again correctly.
+
+ - import-tars script (in contrib/) handles GNU tar archives
+ that contain pathnames longer than 100 bytes (long-link
+ extension) correctly.
+
+ - xdelta test program did not build correctly.
+
+ - gitweb sometimes tried incorrectly to apply function to
+ decode utf8 twice, resulting in corrupt output.
+
+ - "git blame -C" mishandled text at the end of a group of
+ lines.
+
+ - "git log/rev-list --boundary" did not produce output
+ correctly without --left-right option.
+
+ - Many documentation updates.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 67f5b9b6a..13db9699c 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1836,12 +1836,12 @@ Now, assume your personal repository is in the directory ~/proj. We
first create a new clone of the repository:
-------------------------------------------------
-$ git clone --bare proj.git
+$ git clone --bare ~/proj proj.git
-------------------------------------------------
-The resulting directory proj.git will contains a "bare" git
-repository--it is just the contents of the ".git" directory, without
-a checked-out copy of a working directory.
+The resulting directory proj.git contains a "bare" git repository--it is
+just the contents of the ".git" directory, without a checked-out copy of
+a working directory.
Next, copy proj.git to the server where you plan to host the
public repository. You can use scp, rsync, or whatever is most
@@ -2372,9 +2372,8 @@ $ git config remote.example.fetch master:refs/remotes/example/master
then the following commands will all do the same thing:
-------------------------------------------------
-$ git fetch git://example.com/proj.git master:ref/remotes/example/master
-$ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
+$ git fetch git://example.com/proj.git master:refs/remotes/example/master
+$ git fetch example master:refs/remotes/example/master
$ git fetch example
-------------------------------------------------
diff --git a/git.spec.in b/git.spec.in
index 556bdda7a..9de655c18 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -183,9 +183,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
-%{!?_without_docs: %doc Documentation/*.html }
+%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
%changelog
+* Tue May 8 2007 Quy Tonthat <qtonthat@gmail.com>
+- Added howto files
+
* Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru>
- Added the git-p4 package: Perforce import stuff.
diff --git a/utf8.c b/utf8.c
index a2965c9c1..4efef6faf 100644
--- a/utf8.c
+++ b/utf8.c
@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
* in ISO 10646.
*/
-static int wcwidth(ucs_char_t ch)
+static int git_wcwidth(ucs_char_t ch)
{
/*
* Sorted list of non-overlapping intervals of non-spacing characters,
@@ -207,7 +207,7 @@ invalid:
return 0;
}
- return wcwidth(ch);
+ return git_wcwidth(ch);
}
int is_utf8(const char *text)