mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
  Update cherry documentation.
  Refer to git-rev-parse:Specifying Revisions from git.txt
  git-fetch.sh printed protocol fix
  RPM package re-classification.
  Documentation: note about contrib/.
  git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
  Set $HOME for selftests
This commit is contained in:
Junio C Hamano
2006-10-25 12:57:48 -07:00
parent 1259404c7e 70da769a46
commit 7756b1f1dc
9 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/SubmittingPatches
View File

@ -101,6 +101,11 @@ send it "To:" the mailing list, and optionally "cc:" him. If it
is trivially correct or after the list reached a consensus, send is trivially correct or after the list reached a consensus, send
it "To:" the maintainer and optionally "cc:" the list. it "To:" the maintainer and optionally "cc:" the list.
Also note that your maintainer does not actively involve himself in
maintaining what are in contrib/ hierarchy. When you send fixes and
enhancements to them, do not forget to "cc: " the person who primarily
worked on that hierarchy in contrib/.
(6) Sign your work (6) Sign your work

5
Documentation/git-cherry.txt
View File

@ -14,8 +14,9 @@ DESCRIPTION
The changeset (or "diff") of each commit between the fork-point and <head> The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>. is compared against each commit between the fork-point and <upstream>.
Every commit with a changeset that doesn't exist in the other branch Every commit that doesn't exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. Those existing only has its id (sha1) reported, prefixed by a symbol. The ones that have
equivalent change already
in the <upstream> branch are prefixed with a minus (-) sign, and those in the <upstream> branch are prefixed with a minus (-) sign, and those
that only exist in the <head> branch are prefixed with a plus (+) symbol. that only exist in the <head> branch are prefixed with a plus (+) symbol.

3
Documentation/git.txt
View File

@ -562,6 +562,9 @@ HEAD::
a valid head 'name' a valid head 'name'
(i.e. the contents of `$GIT_DIR/refs/heads/<head>`). (i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
File/Directory Structure File/Directory Structure
------------------------ ------------------------

4
git-cherry.sh
View File

@ -12,8 +12,8 @@ LONG_USAGE=' __*__*__*__*__> <upstream>
Each commit between the fork-point (or <limit> if given) and <head> is Each commit between the fork-point (or <limit> if given) and <head> is
examined, and compared against the change each commit between the examined, and compared against the change each commit between the
fork-point and <upstream> introduces. If the change seems to be in fork-point and <upstream> introduces. If the change seems to be in
the upstream, it is shown on the standard output with prefix "+". the upstream, it is shown on the standard output with prefix "-".
Otherwise it is shown with prefix "-".' Otherwise it is shown with prefix "+".'
. git-sh-setup . git-sh-setup
case "$1" in -v) verbose=t; shift ;; esac case "$1" in -v) verbose=t; shift ;; esac

3
git-fetch.sh
View File

@ -296,6 +296,7 @@ fetch_main () {
# There are transports that can fetch only one head at a time... # There are transports that can fetch only one head at a time...
case "$remote" in case "$remote" in
http://* | https://* | ftp://*) http://* | https://* | ftp://*)
proto=`expr "$remote" : '\([^:]*\):'`
if [ -n "$GIT_SSL_NO_VERIFY" ]; then if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k" curl_extra_args="-k"
fi fi
@ -319,7 +320,7 @@ fetch_main () {
done done
expr "z$head" : "z$_x40\$" >/dev/null || expr "z$head" : "z$_x40\$" >/dev/null ||
die "Failed to fetch $remote_name from $remote" die "Failed to fetch $remote_name from $remote"
echo >&2 Fetching "$remote_name from $remote" using http echo >&2 "Fetching $remote_name from $remote using $proto"
git-http-fetch -v -a "$head" "$remote/" || exit git-http-fetch -v -a "$head" "$remote/" || exit
;; ;;
rsync://*) rsync://*)

9
git-svn.perl
View File

@ -1501,10 +1501,13 @@ sub svn_checkout_tree {
apply_mod_line_blob($m); apply_mod_line_blob($m);
svn_check_prop_executable($m); svn_check_prop_executable($m);
} elsif ($m->{chg} eq 'T') { } elsif ($m->{chg} eq 'T') {
sys(qw(svn rm --force),$m->{file_b});
apply_mod_line_blob($m);
sys(qw(svn add), $m->{file_b});
svn_check_prop_executable($m); svn_check_prop_executable($m);
apply_mod_line_blob($m);
if ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
sys(qw(svn propdel svn:special), $m->{file_b});
} else {
sys(qw(svn propset svn:special *),$m->{file_b});
}
} elsif ($m->{chg} eq 'A') { } elsif ($m->{chg} eq 'A') {
svn_ensure_parent_path( $m->{file_b} ); svn_ensure_parent_path( $m->{file_b} );
apply_mod_line_blob($m); apply_mod_line_blob($m);

12
git.spec.in
View File

@ -96,10 +96,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0 %if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else %else
rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif %endif
@ -126,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT
%files arch %files arch
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*arch*.txt %doc Documentation/git-archimport.txt
%{_bindir}/*arch* %{_bindir}/git-archimport
%{!?_without_docs: %{_mandir}/man1/*arch*.1*} %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/*arch*.html } %{!?_without_docs: %doc Documentation/git-archimport.html }
%files email %files email
%defattr(-,root,root) %defattr(-,root,root)

3
t/test-lib.sh
View File

@ -207,7 +207,8 @@ test_done () {
# t/ subdirectory and are run in trash subdirectory. # t/ subdirectory and are run in trash subdirectory.
PATH=$(pwd)/..:$PATH PATH=$(pwd)/..:$PATH
GIT_EXEC_PATH=$(pwd)/.. GIT_EXEC_PATH=$(pwd)/..
export PATH GIT_EXEC_PATH HOME=$(pwd)/trash
export PATH GIT_EXEC_PATH HOME
# Similarly use ../compat/subprocess.py if our python does not # Similarly use ../compat/subprocess.py if our python does not
# have subprocess.py on its own. # have subprocess.py on its own.

3
xdiff/xemit.c
View File

@ -86,8 +86,7 @@ static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
if (len > 0 && if (len > 0 &&
(isalpha((unsigned char)*rec) || /* identifier? */ (isalpha((unsigned char)*rec) || /* identifier? */
*rec == '_' || /* also identifier? */ *rec == '_' || /* also identifier? */
*rec == '(' || /* lisp defun? */ *rec == '$')) { /* mysterious GNU diff's invention */
*rec == '#')) { /* #define? */
if (len > sz) if (len > sz)
len = sz; len = sz;
while (0 < len && isspace((unsigned char)rec[len - 1])) while (0 < len && isspace((unsigned char)rec[len - 1]))