提交 · 1d4710d06ccf6911b42a3a7b4a4bf148008f32a5 · 李少辉-开发者 / git

12 9月, 2005 6 次提交

[PATCH] archimport - use GIT_DIR instead of hardcoded ".git" · 1d4710d0

由 martin@catalyst.net.nz 提交于 9月 11, 2005

Use GIT_DIR from the environment instead of a hardcoded '.git' string.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

1d4710d0

[PATCH] archimport - update in-script doco, options tidyup · 241b5967

由 martin@catalyst.net.nz 提交于 9月 11, 2005

Updated the usage/help message to match asciidoc documentation. The perldoc
documentation now includes the first paragraph from the asciidoc documentation
and points users to the manpage.

Updated TODO section.

Removed some redundant options from the getopt() invocation.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

241b5967

[PATCH] archimport documentation tidyup · a5c500b7

由 martin@catalyst.net.nz 提交于 9月 11, 2005

New "merges" headline, clarified some parts that were not easy to understand.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

a5c500b7

[PATCH] archimport documentation update · a4c5f9aa

由 martin@catalyst.net.nz 提交于 9月 11, 2005

Updated and expanded the command description, and added a reference of the
command line options.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

a4c5f9aa

[PATCH] Escape asciidoc's built-in em-dash replacement · e1ccf53a

由 Yasushi SHOJI 提交于 9月 12, 2005

AsciiDoc replace '--' with em-dash (&#8212) by default. em-dash
looks a lot like a single long dash and it's very confusing when
we are talking about command options.

Section 21.2.8 'Replacements' of AsciiDoc's User Guide says that a
backslash in front of double dash prevent the replacement.  This
patch does just that.
Signed-off-by: NYasushi SHOJI <yashi@atmark-techno.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

e1ccf53a

[PATCH] Fix buffer overflow in ce_flush(). · 2c865d9a

由 Qingning Huo 提交于 9月 11, 2005

Add a check before appending SHA1 signature to write_buffer,
flush it first if necessary.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

2c865d9a

11 9月, 2005 17 次提交

Add a new merge strategy by Fredrik Kuivinen. · 720d150c

由 Junio C Hamano 提交于 9月 10, 2005

I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting.  For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.

The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

720d150c

'git-merge': Documentation. · 0f69be53

由 Junio C Hamano 提交于 9月 09, 2005

... and add link from git.txt, as usual.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

0f69be53

J
Use Daniel's read-tree in the merge strategy 'resolve'. · 2276aa6c
由 Junio C Hamano 提交于 9月 10, 2005
```
And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
2276aa6c

Multi-backend merge driver. · 91063bbc

由 Junio C Hamano 提交于 9月 08, 2005

The new command 'git merge' takes the current head and one or more
remote heads, with the commit log message for the automated case.

If the heads being merged are simple fast-forwards, it acts the
same way as the current 'git resolve'.  Otherwise, it tries
different merge strategies and takes the result from the one that
succeeded auto-merging, if there is any.

If no merge strategy succeeds auto-merging, their results are
evaluated for number of paths needed for hand resolving, and the
one with the least number of such paths is left in the working
tree.  The user is asked to resolve them by hand and make a
commit manually.

The calling convention from the 'git merge' driver to merge
strategy programs is very simple:

 - A strategy program is to be called 'git-merge-<strategy>'.

 - They take input of this form:

	<common1> <common2> ... '--' <head> <remote1> <remote2>...

   That is, one or more the common ancestors, double dash, the
   current head, and one or more remote heads being merged into
   the current branch.

 - Before a strategy program is called, the working tree is
   matched to the current <head>.

 - The strategy program exits with status code 0 when it
   successfully auto-merges the given heads.  It should do
   update-cache for all the merged paths when it does so -- the
   index file will be used to record the merge result as a
   commit by the driver.

 - The strategy program exits with status code 1 when it leaves
   conflicts behind.  It should do update-cache for all the
   merged paths that it successfully auto-merged, and leave the
   cache entry in the index file as the same as <head> for paths
   it could not auto-merge, and leave its best-effort result
   with conflict markers in the working tree when it does so.

 - The strategy program exists with status code other than 0 or
   1 if it does not handle the given merge at all.

As examples, this commit comes with merge strategies based on
'git resolve' and 'git octopus'.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

91063bbc

Plug leak in Daniel's read-tree. · bb97a2a8

由 Junio C Hamano 提交于 9月 10, 2005

... and it is ready to be pushed out in the "master" branch.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

bb97a2a8

[PATCH] Add debugging help for case #16 to read-tree.c · 4d3fe0c5

由 Junio C Hamano 提交于 9月 06, 2005

This will help us detect if real-world example merges have multiple
merge-base candidates and one of them matches one head while another
matches the other head.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

4d3fe0c5

J
[PATCH] Disable debugging from read-tree. · 2ab706a3
由 Junio C Hamano 提交于 9月 05, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
2ab706a3
D
[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. · 3d89cb4f
由 Daniel Barkalow 提交于 9月 05, 2005
```
Signed-off-by: Daniel Barkalow
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
3d89cb4f

[PATCH] Rewrite read-tree · ee6566e8

由 Daniel Barkalow 提交于 9月 05, 2005

Adds support for multiple ancestors, removes --emu23, much simplification.
Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

ee6566e8

D
[PATCH] Add function to append to an object_list. · 680bab3d
由 Daniel Barkalow 提交于 9月 05, 2005
```
Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
680bab3d
D
[PATCH] Add a function for getting a struct tree for an ent. · 77675e2a
由 Daniel Barkalow 提交于 9月 05, 2005
```
Signed-off-by: NDaniel Barkalow <barkalow@iabervon.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
77675e2a

Fix 'git-show-branch --list <head>' · c9d023b2

由 Junio C Hamano 提交于 9月 10, 2005

It mistakenly failed to output anything when given a single head.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

c9d023b2

J
Add 'git bisect replay/log' documentation. · b595ed14
由 Junio C Hamano 提交于 9月 10, 2005
```
... lest I get yelled at by a very angry scm ;-).
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
b595ed14

Keep bisection log so that it can be replayed later. · e204de28

由 Junio C Hamano 提交于 9月 10, 2005

The 'git bisect' command was very unforgiving in that once you made a
mistake telling it good/bad it was very hard to take it back. Keep a
log of what you told it in an earlier session, so that it can be
replayed after removing everything after what you botched last time.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

e204de28

Fix copy marking from diffcore-rename. · 6bac10d8

由 Junio C Hamano 提交于 9月 10, 2005

When (A,B) ==> (B,C) rename-copy was detected, we incorrectly said
that C was created by copying B. This is because we only check if the
path of rename/copy source still exists in the resulting tree to see
if the file is renamed out of existence. In this case, the new B is
created by copying or renaming A, so the original B is lost and we
should say C is a rename of B not a copy of B.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

6bac10d8

[PATCH] archimport - add merge detection · b779d5f0

由 martin@catalyst.net.nz 提交于 9月 10, 2005

We now keep track of the patches merged in each branch since they have
diverged, using the records that the Arch "logs" provide. Merge parents
for a commit are defined if we are merging a series of patches that starts
from the mergebase.

If patches from a related branch are merged out-of-order, we keep track of
how much has been merged sequentially -- the tip of that sequential merge
is our new parent from that branch.

This mechanism works very well for branches that merge in dovetail and/or
flying fish patterns, probably less well for others.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

b779d5f0

Make sure we have leading directories under refs/{heads,tags} · 866ff2f7

由 Junio C Hamano 提交于 9月 10, 2005

Otherwise having subdirectories under refs/heads becomes rather
unwieldy.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

866ff2f7

10 9月, 2005 7 次提交

S
[PATCH] Documentation/repository-layout.txt typo · d5e34380
由 Sven Verdoolaege 提交于 9月 10, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
d5e34380

show-branch: --list and --independent · 1f8af483

由 Junio C Hamano 提交于 9月 09, 2005

The --list option is what 'git branch' without parameter should
have been; it shows the one-line commit message for each branch
name.  The --independent option is used to filter out commits
that can be reachable from other commits, to make detection of
fast forward condition in multi-head merge easier.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

1f8af483

Retire support for old environment variables. · a9ab586a

由 Junio C Hamano 提交于 9月 09, 2005

We have deprecated the old environment variable names for quite a
while and now it's time to remove them.  Gone are:

    SHA1_FILE_DIRECTORIES AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME
    COMMIT_AUTHOR_EMAIL COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY
Signed-off-by: NJunio C Hamano <junkio@cox.net>

a9ab586a

J
Adjust .gitignore for big rename. · 44ec46a9
由 Junio C Hamano 提交于 9月 09, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
44ec46a9

[PATCH] remove duplicate git-send-email-script.perl target in Makefile · 03d98d39

由 Marco Roeland 提交于 9月 09, 2005

Remove duplicate git-send-email-perl target in Makefile.

When WITH_SEND_EMAIL was defined, as in the Debian 'deb' target,
git-send-email-perl was added twice to SCRIPT_PERL, leading to a
duplicate definition in the Makefile. Creating a ".deb" then failed.
Signed-off-by: NMarco Roeland <marco.roeland@xs4all.nl>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

03d98d39

[PATCH] fix tutorial typo · 96768e31

由 jdl@freescale.com 提交于 9月 09, 2005

Fix a minor typo in the tutorial.txt.
Signed-off-by: NJon Loeliger <jdl@freescale.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

96768e31

[PATCH] Fix tutorial reference to git-*-scripts. · c87d41eb

由 jdl@freescale.com 提交于 9月 09, 2005

There was a lingering reference to the git-*-scripts in
the tutorial.  This patch reworks that paragraph a bit.
Signed-off-by: NJon Loeliger <jdl@freescale.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

c87d41eb

09 9月, 2005 4 次提交

J
Ignore datestamp-only changes when installing webdoc. · 922fb98e
由 Junio C Hamano 提交于 9月 09, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
922fb98e

Squelch `removal' message from 'git reset --hard'. · e8623d45

由 Junio C Hamano 提交于 9月 08, 2005

We do not say anything about checking out, so mentioning removal only
gets unnecessarily alarming.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

e8623d45

'build' scripts before installing. · bc6146d2

由 Junio C Hamano 提交于 9月 08, 2005

Earlier we renamed git-foo.sh to git-foo while installing, which
was mostly done by inertia than anything else.  This however
made writing tests to use scripts harder.

This patch builds the scripts the same way as we build binaries
from their sources.  As a side effect, you can now specify
non-standard paths you have your Perl binary is in when running
the make.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

bc6146d2

J
Show all merge-base candidates from show-branch --merge-base · 2f0f8b71
由 Junio C Hamano 提交于 9月 08, 2005
```
This would make things easier to use for Octopus.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
2f0f8b71

08 9月, 2005 6 次提交

Documentation updates. · 35ef3a4c

由 Junio C Hamano 提交于 9月 07, 2005

Fill in more missing documentation.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

35ef3a4c

[PATCH] git-daemon --inetd · 7c3693f1

由 lars.doelle@on-line.de 提交于 9月 08, 2005

git-daemon using inetd. does not work properly. inetd routes stderr onto the
network line just like stdout, which was apparently not expected to be so.

As the result of this, the stream is closed by the receiver, because some
"Packing %d objects\n" originating from pack_objects is first reported over
the line instead of the expected pack_header, and so the SIGNATURE test
fails. Here is a workaround.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

7c3693f1

git --version tells which version of git you have. · 6a2e50f9

由 Junio C Hamano 提交于 9月 07, 2005

Originally from Martin Atukunda <matlads@dsmagic.com> but adjusted for
post-rename code.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

6a2e50f9

[PATCH] Do not create bogus branch from flag to git branch · a3b427b9

由 Amos Waterland 提交于 9月 07, 2005

If you run `git branch --help', you will unexpectedly have created a new
branch named "--help". This simple patch adds logic and a usage
statement to catch this and similar problems, and adds a testcase for it.
Signed-off-by: NAmos Waterland <apw@rossby.metr.ou.edu>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

a3b427b9

[PATCH] Portability fix for Solaris 10/x86 · f0ebff0d

由 Patrick Mauritz 提交于 9月 06, 2005

 * getdomainname unavailable there.
 * needs -lsocket for linkage.
 * needs __EXTENSIONS__ at the beginning of convert-objects.c

[JC: I've done this slightly differently from what Patrick originally
sent to the list and dropped the bit that deals with installations
that has curl header and library at non-default location.  I am
resisting the slipperly slope called autoconf.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

f0ebff0d

Big tool rename. · 215a7ad1

由 Junio C Hamano 提交于 9月 07, 2005

As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

215a7ad1

李少辉-开发者 / git 与 Fork 源项目一致

李少辉-开发者 / git
与 Fork 源项目一致