From 52c80037e423c7e7806cf2f198ed978dc36fa654 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Mon, 7 May 2007 23:34:26 -0400 Subject: user-manual: fix clone and fetch typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar Signed-off-by: "J. Bruce Fields" Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 67f5b9b6ab..13db9699c1 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 ------------------------------------------------- -- cgit v1.2.3 From b51be13c9c83621551824876ee037151a92f0323 Mon Sep 17 00:00:00 2001 From: Amos Waterland Date: Tue, 8 May 2007 00:46:08 -0400 Subject: wcwidth redeclaration Build fails for git 1.5.1.3 on AIX, with the message: utf8.c:66: error: conflicting types for 'wcwidth' /.../lib/gcc/powerpc-ibm-aix5.3.0.0/4.0.3/include/string.h:266: error: previous declaration of 'wcwidth' was here Fix this by renaming our static variant to our own name. Signed-off-by: Amos Waterland Signed-off-by: Junio C Hamano --- utf8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utf8.c b/utf8.c index a2965c9c11..4efef6faf7 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) -- cgit v1.2.3 From 22f09585d402f79f8248b30253c3338f69114ba3 Mon Sep 17 00:00:00 2001 From: Quy Tonthat Date: Wed, 9 May 2007 00:19:41 +1000 Subject: Add howto files to rpm packages. RPM packages did not include howto files which causes broken links in howto-index.html Signed-off-by: Quy Tonthat Signed-off-by: Junio C Hamano --- git.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git.spec.in b/git.spec.in index 87197d10e1..b0ea62884f 100644 --- a/git.spec.in +++ b/git.spec.in @@ -166,9 +166,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 +- Added howto files + * Mon Feb 13 2007 Nicolas Pitre - Update core package description (Git isn't as stupid as it used to be) -- cgit v1.2.3 From 1cc202bd4ebd0390d738f0d633d42791cb79dd05 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 8 May 2007 22:10:56 -0700 Subject: GIT v1.5.1.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.1.4.txt | 30 ++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.5.1.4.txt diff --git a/Documentation/RelNotes-1.5.1.4.txt b/Documentation/RelNotes-1.5.1.4.txt new file mode 100644 index 0000000000..df2f66ccb5 --- /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/GIT-VERSION-GEN b/GIT-VERSION-GEN index cd9e0500e0..094a0d1b0e 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.1.3.GIT +DEF_VER=v1.5.1.4.GIT LF=' ' diff --git a/RelNotes b/RelNotes index b630faa0c0..4cad80a03c 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.1.3.txt \ No newline at end of file +Documentation/RelNotes-1.5.1.4.txt \ No newline at end of file -- cgit v1.2.3