Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
Junio C Hamano committed Oct 25, 2006
2 parents 1259404 + 70da769 commit 7756b1f
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 17 deletions.
5 changes: 5 additions & 0 deletions Documentation/SubmittingPatches
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

Expand Down
5 changes: 3 additions & 2 deletions Documentation/git-cherry.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ DESCRIPTION
The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>.

Every commit with a changeset that doesn't exist in the other branch
has its id (sha1) reported, prefixed by a symbol. Those existing only
Every commit that doesn't exist in the <upstream> branch
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
that only exist in the <head> branch are prefixed with a plus (+) symbol.

Expand Down
3 changes: 3 additions & 0 deletions Documentation/git.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,9 @@ HEAD::
a valid head 'name'
(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
------------------------
Expand Down
4 changes: 2 additions & 2 deletions git-cherry.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ LONG_USAGE=' __*__*__*__*__> <upstream>
Each commit between the fork-point (or <limit> if given) and <head> is
examined, and compared against the change each commit between the
fork-point and <upstream> introduces. If the change seems to be in
the upstream, it is shown on the standard output with prefix "+".
Otherwise it is shown with prefix "-".'
the upstream, it is shown on the standard output with prefix "-".
Otherwise it is shown with prefix "+".'
. git-sh-setup

case "$1" in -v) verbose=t; shift ;; esac
Expand Down
3 changes: 2 additions & 1 deletion git-fetch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ fetch_main () {
# There are transports that can fetch only one head at a time...
case "$remote" in
http://* | https://* | ftp://*)
proto=`expr "$remote" : '\([^:]*\):'`
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
Expand All @@ -319,7 +320,7 @@ fetch_main () {
done
expr "z$head" : "z$_x40\$" >/dev/null ||
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
;;
rsync://*)
Expand Down
9 changes: 6 additions & 3 deletions git-svn.perl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1501,10 +1501,13 @@ sub svn_checkout_tree {
apply_mod_line_blob($m);
svn_check_prop_executable($m);
} 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);
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') {
svn_ensure_parent_path( $m->{file_b} );
apply_mod_line_blob($m);
Expand Down
12 changes: 6 additions & 6 deletions git.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
%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
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
Expand All @@ -126,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }
%doc Documentation/git-archimport.txt
%{_bindir}/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html }

%files email
%defattr(-,root,root)
Expand Down
3 changes: 2 additions & 1 deletion t/test-lib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ test_done () {
# t/ subdirectory and are run in trash subdirectory.
PATH=$(pwd)/..:$PATH
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
# have subprocess.py on its own.
Expand Down
3 changes: 1 addition & 2 deletions xdiff/xemit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
if (len > 0 &&
(isalpha((unsigned char)*rec) || /* identifier? */
*rec == '_' || /* also identifier? */
*rec == '(' || /* lisp defun? */
*rec == '#')) { /* #define? */
*rec == '$')) { /* mysterious GNU diff's invention */
if (len > sz)
len = sz;
while (0 < len && isspace((unsigned char)rec[len - 1]))
Expand Down

0 comments on commit 7756b1f

Please sign in to comment.