Skip to content

Commit 2e13e5d

Browse files
spearcespearce
committed
Merge branch 'master' into db/fetch-pack
There's a number of tricky conflicts between master and this topic right now due to the rewrite of builtin-push. Junio must have handled these via rerere; I'd rather not deal with them again so I'm pre-merging master into the topic. Besides this topic somehow started to depend on the strbuf series that was in next, but is now in master. It no longer compiles on its own without the strbuf API. * master: (184 commits) Whip post 1.5.3.4 maintenance series into shape. Minor usage update in setgitperms.perl manual: use 'URL' instead of 'url'. manual: add some markup. manual: Fix example finding commits referencing given content. Fix wording in push definition. Fix some typos, punctuation, missing words, minor markup. manual: Fix or remove em dashes. Add a --dry-run option to git-push. Add a --dry-run option to git-send-pack. Fix in-place editing functions in convert.c instaweb: support for Ruby's WEBrick server instaweb: allow for use of auto-generated scripts Add 'git-p4 commit' as an alias for 'git-p4 submit' hg-to-git speedup through selectable repack intervals git-svn: respect Subversion's [auth] section configuration values gtksourceview2 support for gitview fix contrib/hooks/post-receive-email hooks.recipients error message Support cvs via git-shell rebase -i: use diff plumbing instead of porcelain ... Conflicts: Makefile builtin-push.c rsh.c
2 parents ccfc02a + d55e7c3 commit 2e13e5d

File tree

164 files changed

+4642
-2998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+4642
-2998
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ git-clone
2525
git-commit
2626
git-commit-tree
2727
git-config
28-
git-convert-objects
2928
git-count-objects
3029
git-cvsexportcommit
3130
git-cvsimport
@@ -172,3 +171,6 @@ config.status
172171
config.mak.autogen
173172
config.mak.append
174173
configure
174+
tags
175+
TAGS
176+
cscope*

‎Documentation/RelNotes-1.5.3.3.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
GIT v1.5.3.3 Release Notes
2+
==========================
3+
4+
Fixes since v1.5.3.2
5+
--------------------
6+
7+
* git-quiltimport did not like it when a patch described in the
8+
series file does not exist.
9+
10+
* p4 importer missed executable bit in some cases.
11+
12+
* The default shell on some FreeBSD did not execute the
13+
argument parsing code correctly and made git unusable.
14+
15+
* git-svn incorrectly spawned pager even when the user user
16+
explicitly asked not to.
17+
18+
* sample post-receive hook overquoted the envelope sender
19+
value.
20+
21+
* git-am got confused when the patch contained a change that is
22+
only about type and not contents.
23+
24+
* git-mergetool did not show our and their version of the
25+
conflicted file when started from a subdirectory of the
26+
project.
27+
28+
* git-mergetool did not pass correct options when invoking diff3.
29+
30+
* git-log sometimes invoked underlying "diff" machinery
31+
unnecessarily.

‎Documentation/RelNotes-1.5.3.4.txt‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
GIT v1.5.3.4 Release Notes
2+
==========================
3+
4+
Fixes since v1.5.3.3
5+
--------------------
6+
7+
* Change to "git-ls-files" in v1.5.3.3 that was introduced to support
8+
partial commit of removal better had a segfaulting bug, which was
9+
diagnosed and fixed by Keith and Carl.
10+
11+
* Performance improvements for rename detection has been backported
12+
from the 'master' branch.
13+
14+
* "git-for-each-ref --format='%(numparent)'" was not working
15+
correctly at all, and --format='%(parent)' was not working for
16+
merge commits.
17+
18+
* Sample "post-receive-hook" incorrectly sent out push
19+
notification e-mails marked as "From: " the committer of the
20+
commit that happened to be at the tip of the branch that was
21+
pushed, not from the person who pushed.
22+
23+
* "git-remote" did not exit non-zero status upon error.
24+
25+
* "git-add -i" did not respond very well to EOF from tty nor
26+
bogus input.
27+
28+
* "git-rebase -i" squash subcommand incorrectly made the
29+
author of later commit the author of resulting commit,
30+
instead of taking from the first one in the squashed series.
31+
32+
* "git-stash apply --index" was not documented.
33+
34+
* autoconfiguration learned that "ar" command is found as "gas" on
35+
some systems.

‎Documentation/RelNotes-1.5.3.5.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
GIT v1.5.3.5 Release Notes
2+
==========================
3+
4+
Fixes since v1.5.3.4
5+
--------------------
6+
7+
* "git-config" silently ignored options after --list; now it wilh
8+
error out with a usage message.
9+
10+
* "git-config --file" failed if the argument used a relative path
11+
as it changed directories before opening the file.
12+
13+
* "git-add -i" did not handle single line hunks correctly.
14+
15+
* "git-log --follow" did not work unless diff generation (e.g. -p)
16+
was also requested.
17+
18+
* "git-log" printed extra newlines between commits when a diff
19+
was generated internally (e.g. -S or --follow) but not displayed.
20+
21+
* Documention updates for supported (but previously undocumented)
22+
options of "git-archive" and "git-reflog".
23+
24+
* "make clean" no longer deletes the configure script that ships
25+
with the git tarball, making multiple architecture builds easier.

‎Documentation/RelNotes-1.5.4.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,32 @@ GIT v1.5.4 Release Notes
44
Updates since v1.5.3
55
--------------------
66

7+
* git-reset is now built-in.
78

9+
* git-send-email can optionally talk over ssmtp and use SMTP-AUTH.
10+
11+
* git-rebase learned --whitespace option.
12+
13+
* git-remote knows --mirror mode.
14+
15+
* git-merge can call the "post-merge" hook.
16+
17+
* git-pack-objects can optionally run deltification with multiple threads.
18+
19+
* git-archive can optionally substitute keywords in files marked with
20+
export-subst attribute.
21+
22+
* Various Perforce importer updates.
823

924
Fixes since v1.5.3
1025
------------------
1126

1227
All of the fixes in v1.5.3 maintenance series are included in
1328
this release, unless otherwise noted.
1429

30+
--
31+
exec >/var/tmp/1
32+
O=v1.5.3.2-99-ge4b2890
33+
echo O=`git describe refs/heads/master`
34+
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
35+

‎Documentation/cmd-list.perl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ sub format_one {
9494
git-commit mainporcelain
9595
git-commit-tree plumbingmanipulators
9696
git-config ancillarymanipulators
97-
git-convert-objects ancillarymanipulators
9897
git-count-objects ancillaryinterrogators
9998
git-cvsexportcommit foreignscminterface
10099
git-cvsimport foreignscminterface

‎Documentation/config.txt‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ core.worktree::
188188
Set the path to the working tree. The value will not be
189189
used in combination with repositories found automatically in
190190
a .git directory (i.e. $GIT_DIR is not set).
191-
This can be overriden by the GIT_WORK_TREE environment
191+
This can be overridden by the GIT_WORK_TREE environment
192192
variable and the '--work-tree' command line option.
193193

194194
core.logAllRefUpdates::
@@ -338,6 +338,12 @@ branch.<name>.merge::
338338
branch.<name>.merge to the desired branch, and use the special setting
339339
`.` (a period) for branch.<name>.remote.
340340

341+
branch.<name>.mergeoptions::
342+
Sets default options for merging into branch <name>. The syntax and
343+
supported options are equal to that of gitlink:git-merge[1], but
344+
option values containing whitespace characters are currently not
345+
supported.
346+
341347
clean.requireForce::
342348
A boolean to make git-clean do nothing unless given -f or -n. Defaults
343349
to false.
@@ -440,6 +446,19 @@ gc.aggressiveWindow::
440446
algorithm used by 'git gc --aggressive'. This defaults
441447
to 10.
442448

449+
gc.auto::
450+
When there are approximately more than this many loose
451+
objects in the repository, `git gc --auto` will pack them.
452+
Some Porcelain commands use this command to perform a
453+
light-weight garbage collection from time to time. Setting
454+
this to 0 disables it.
455+
456+
gc.autopacklimit::
457+
When there are more than this many packs that are not
458+
marked with `*.keep` file in the repository, `git gc
459+
--auto` consolidates them into one larger pack. Setting
460+
this to 0 disables this.
461+
443462
gc.packrefs::
444463
`git gc` does not run `git pack-refs` in a bare repository by
445464
default so that older dumb-transport clients can still fetch
@@ -580,7 +599,7 @@ merge.summary::
580599

581600
merge.tool::
582601
Controls which merge resolution program is used by
583-
gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
602+
gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff",
584603
"meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
585604

586605
merge.verbosity::
@@ -589,7 +608,7 @@ merge.verbosity::
589608
message if conflicts were detected. Level 1 outputs only
590609
conflicts, 2 outputs conflicts and file changes. Level 5 and
591610
above outputs debugging information. The default is level 2.
592-
Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
611+
Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
593612

594613
merge.<driver>.name::
595614
Defines a human readable name for a custom low-level

‎Documentation/core-tutorial.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,8 @@ Although git is a truly distributed system, it is often
14591459
convenient to organize your project with an informal hierarchy
14601460
of developers. Linux kernel development is run this way. There
14611461
is a nice illustration (page 17, "Merges to Mainline") in
1462-
link:http://tinyurl.com/a2jdg[Randy Dunlap's presentation].
1462+
link:http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf
1463+
[Randy Dunlap's presentation].
14631464

14641465
It should be stressed that this hierarchy is purely *informal*.
14651466
There is nothing fundamental in git that enforces the "chain of

‎Documentation/diff-options.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@
179179

180180
--ext-diff::
181181
Allow an external diff helper to be executed. If you set an
182-
external diff driver with gitlink:gitattributes(5), you need
183-
to use this option with gitlink:git-log(1) and friends.
182+
external diff driver with gitlink:gitattributes[5], you need
183+
to use this option with gitlink:git-log[1] and friends.
184184

185185
--no-ext-diff::
186186
Disallow external diff drivers.

‎Documentation/git-apply.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SYNOPSIS
1010
--------
1111
[verse]
1212
'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]
13-
[--apply] [--no-add] [--index-info] [-R | --reverse]
13+
[--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse]
1414
[--allow-binary-replacement | --binary] [--reject] [-z]
1515
[-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
1616
[--whitespace=<nowarn|warn|error|error-all|strip>]
@@ -63,12 +63,15 @@ OPTIONS
6363
cached data, apply the patch, and store the result in the index,
6464
without using the working tree. This implies '--index'.
6565

66-
--index-info::
66+
--build-fake-ancestor <file>::
6767
Newer git-diff output has embedded 'index information'
6868
for each blob to help identify the original version that
6969
the patch applies to. When this flag is given, and if
70-
the original version of the blob is available locally,
71-
outputs information about them to the standard output.
70+
the original versions of the blobs is available locally,
71+
builds a temporary index containing those blobs.
72+
+
73+
When a pure mode change is encountered (which has no index information),
74+
the information is read from the current index instead.
7275

7376
-R, --reverse::
7477
Apply the patch in reverse.

0 commit comments

Comments
 (0)