Merge branch 'maint'
* maint: GIT v1.5.1.4 Add howto files to rpm packages. wcwidth redeclaration user-manual: fix clone and fetch typos
This commit is contained in:
commit
4662231e56
30
Documentation/RelNotes-1.5.1.4.txt
Normal file
30
Documentation/RelNotes-1.5.1.4.txt
Normal file
@ -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.
|
@ -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
|
||||
-------------------------------------------------
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
4
utf8.c
4
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)
|
||||
|
Loading…
Reference in New Issue
Block a user