提交 · 6677c4665af2d73f670bec382bc82d0f2e9513fb · 李少辉-开发者 / git

16 12月, 2005 1 次提交

get_sha1_basic(): corner case ambiguity fix · 6677c466

由 Junio C Hamano 提交于 12月 15, 2005

When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and
the object name stored in .git/refs/heads/frotz were corrupt, we
ended up picking tags/frotz without complaining.  Worse yet, if
the corrupt .git/refs/heads/frotz was more than 40 bytes and
began with hexadecimal characters, it silently overwritten the
initial part of the returned result.

This commit adds a couple of tests to demonstrate these cases,
with a fix.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

6677c466

15 12月, 2005 12 次提交

Documentation: tutorial · 8431c4eb

由 Junio C Hamano 提交于 12月 14, 2005

At the beginning of tutorial, refer the reader to everyday if
she has not done so yet.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

8431c4eb

svnimport: exit cleanly when we are up to date · 988eece4

由 Martin Langhoff 提交于 12月 15, 2005

Now we detect that the SVN repo does not have new commits for us and exit
cleanly, removing the lockfile. With this, svnimport supports being run
on a cronjob to maintain a SVN2GIT gateway.
Signed-off-by: NMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

988eece4

clone-pack: make it usable for partial branch cloning. · 31ec6abf

由 Junio C Hamano 提交于 12月 14, 2005

clone-pack had some logic to accept subset of remote refs from
the command line and clone from there.  However, it was never
used in practice and its problems were not found out so far.

This commit changes the command to output the object names of
refs to the standard output instead of making a clone of the
remote repository when explicit <head> parameters are given; the
output format is the same as fetch-pack.

The traditional behaviour of cloning the whole repository by
giving no explicit <head> parameters stays the same.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

31ec6abf

git rebase loses author name/email if given bad email address · 294c695d

由 Amos Waterland 提交于 12月 14, 2005

If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
away the author name and email when fast-forward merging commits.  I
have not tracked it down, but here is a testcase that demonstrates the
behavior.
Signed-off-by: NAmos Waterland <apw@us.ibm.com>
Acked-by: NMichal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

294c695d

Bugfixes for git-rebase · 32d99544

由 Lukas Sandström 提交于 12月 15, 2005

Fix bugs in git-rebase wrt rebasing another branch than
the current HEAD, rebasing with a dirty working dir,
and rebasing a proper decendant of the target branch.

[jc: with a bit of hand-merging]
Signed-off-by: NLukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

32d99544

mailinfo and git-am: allow "John Doe <johndoe>" · e0e3ba20

由 Junio C Hamano 提交于 12月 14, 2005

An isolated developer could have a local-only e-mail, which will
be stripped out by mailinfo because it lacks '@'.  Define a
fallback parser to accomodate that.

At the same time, reject authorless patch in git-am.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

e0e3ba20

M
define MAXPATHLEN for hosts that don't support it · 252fef71
由 Martin Atukunda 提交于 12月 13, 2005
```
[jc: Martin says syllable (www.syllable.org) wants this.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
252fef71
J
Do not let errors pass by unnoticed when running `make check'. · 773b6339
由 Junio C Hamano 提交于 12月 14, 2005
```
[jc: originally from Amos Waterland.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
773b6339
J

Merge branch 'hold/am' · 9a26dbd1
由 Junio C Hamano 提交于 12月 14, 2005

9a26dbd1

rebase: do not get confused in fast-forward situation. · 2db8aaec

由 Junio C Hamano 提交于 12月 14, 2005

When switching to another branch and rebasing it in a one-go, it
failed to update the variable that holds the branch head, and
did not detect fast-forward situation correctly.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

2db8aaec

J

Merge branch 'fk/usage' · b0d3e9ba
由 Junio C Hamano 提交于 12月 14, 2005

b0d3e9ba

Documentation: topic branches · a4adf54d

由 Junio C Hamano 提交于 12月 14, 2005

Recommend git over ssh direct to master.kernel.org, instead of
going over rsync to public machines, since this is meant to be a
procedure for kernel subsystem maintainers.

Also fix an obvious typo.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

a4adf54d

14 12月, 2005 20 次提交

J
applypatch: no need to do non-portable [[ ... ]] · 5073eb04
由 Junio C Hamano 提交于 12月 13, 2005
```
... when old, proven, case would do.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
5073eb04
F
git-repack: Usage string clean-up, emit usage at incorrect invocation · 9678faaa
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
9678faaa
F
git-rebase: Usage string clean-up, emit usage string at incorrect invocation · 3ae39ab2
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
3ae39ab2
F
git-prune: Usage string clean-up, use the 'usage' function · 7ab099d2
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
7ab099d2
F
git-lost-found: Usage string clean-up, emit usage string at incorrect invocation · d20e2f16
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
d20e2f16
F
git-fetch: Usage string clean-up, emit usage string at unrecognized option · 87358b7a
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
87358b7a
F
git-cherry: Usage string clean-up, use the 'usage' function · 43a95cfb
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
43a95cfb
F
git-applypatch: Usage string clean-up, emit usage string at incorrect invocation · 6cf6193b
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
6cf6193b

git-am: Usage string clean-up · cf1fe88c

由 freku045@student.liu.se 提交于 12月 13, 2005

Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

cf1fe88c

git-revert: Usage string clean-up · 4e7824b1

由 freku045@student.liu.se 提交于 12月 13, 2005

Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

4e7824b1

F
git-verify-tag: Usage string clean-up, emit usage string at incorrect invocation · 34970121
由 freku045@student.liu.se 提交于 12月 13, 2005
```
Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
34970121

Trivial usage string clean-up · 806f36d4

由 freku045@student.liu.se 提交于 12月 13, 2005

Signed-off-by: NFredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

806f36d4

J
t3200: branch --help does not die anymore. · aa9dc7af
由 Junio C Hamano 提交于 12月 12, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
aa9dc7af

Usage message clean-up, take #2 · d025524d

由 Fredrik Kuivinen 提交于 12月 11, 2005

There were some problems with the usage message clean-up patch
series. I hadn't realised that subdirectory aware scripts can't source
git-sh-setup. I propose that we change this and let the scripts which
are subdirectory aware set a variable, SUBDIRECTORY_OK, before they
source git-sh-setup.

The scripts will also set USAGE and possibly LONG_USAGE before they
source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE.

If we go this way it's easy to catch --help in git-sh-setup, print the
(long) usage message to stdout and exit cleanly. git-sh-setup can
define a 'usage' shell function which can be called by the scripts to
print the short usage string to stderr and exit non-cleanly. It will
also be easy to change $0 to basename $0 or something else, if would
like to do that sometime in the future.

What follows is a patch to convert a couple of the commands to this
style. If it's ok with everyone to do it this way I will convert the
rest of the scripts too.

[jc: thrown in to proposed updates queue for comments.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

d025524d

git-am support for naked email messages (take 2) · b3f041fb

由 H. Peter Anvin 提交于 12月 13, 2005

This allows git-am to accept single-message files as well as mboxes.
Unlike the previous version, this one doesn't need to be explicitly told
which one it is; rather, it looks to see if the first line is a From
line and uses it to select mbox mode or not.

I moved the logic to do all this into git-mailsplit, which got a new
user interface as result, although the old interface is still available
for backwards compatibility.

[jc: applied with two obvious fixes.]
Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

b3f041fb

Everyday: a bit more examples. · 01f49e34

由 Junio C Hamano 提交于 12月 14, 2005

Talk about the following as well:

 * git fetch --tags
 * Use of "git push" as a one-man distributed development vehicle.
 * Show example of remotes file for pulling and pushing.
 * Annotate git-shell setup.
 * Using Carl's update hook in a CVS-style shared repository.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

01f49e34

J
checkout-index: fix checking out specific path. · f4f9adae
由 Junio C Hamano 提交于 12月 13, 2005
```
3bd348ae commit broke checking
out specific paths.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
f4f9adae

Make git-send-pack exit with error when some refs couldn't be pushed out · ed24928e

由 Petr Baudis 提交于 12月 14, 2005

In case some refs couldn't be pushed out due to an error (mostly the
not-a-proper-subset error), make git-send-pack exit with non-zero status
after the push is over (that is, it still tries to push out the rest
of the refs).

[jc: I adjusted a test for this change.]
Signed-off-by: NPetr Baudis <pasky@suse.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

ed24928e

[PATCH] allow merging any committish · 9954f5b8

由 Junio C Hamano 提交于 12月 13, 2005

Although "git-merge" is advertised as the end-user level command
(instead of being a "git-pull" backend), it was not prepared to
take tag objects that point at commits and barfed when fed one.
Sanitize the input while we validate them, for which we already
have a loop.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

9954f5b8

git-clone: tell the user a bit more about clone-pack failure. · 0a8b4def

由 Junio C Hamano 提交于 12月 13, 2005

When clone-pack has trouble with the remote, it dies unfriendly
"EOF" error message.  We cannot tell the reason why it failed
from the local end; it could be that the repository did not
exist, or configured not to serve over git-daemon, or a network
failure.  At least, saying clone-pack failed makes it a bit more
meaningful.

I am not convinced yet that removing the newly created directory
is the right thing to do, so this commit leaves the new
directory behind.

Reported by Sam Ravnborg.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

0a8b4def

13 12月, 2005 7 次提交

Documentation: not learning core git commands. · 9755afbd

由 Junio C Hamano 提交于 12月 13, 2005

The initial section of tutorial was too heavy on internal
workings for the first-time readers, so rewrite the introductory
section of git(7) to start with "not learning core git commands"
section and refer them to README to grasp the basic concepts,
then Everyday to give overview with task/role oriented examples
for minimum set of commands, and finally the tutorial.

Also add to existing note in the tutorial that many too
technical descriptions can be skipped by a casual reader.

I initially started to review the tutorial, with the objective
of ripping out the detailed technical information altogether,
but I found that the level of details in the initial couple of
sections that talk about refs and the object database in a
hands-on fashion was about rigth, and left all of them there.  I
feel that reading about fsck-index and repack is too abstract
without being aware of these directories and files.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

9755afbd

J
Documentation: diff examples. · 803f498c
由 Junio C Hamano 提交于 12月 13, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
803f498c
J
Documentation: fix missing links to git(7) · 76cead39
由 Junio C Hamano 提交于 12月 12, 2005
```
Also move pack protocol description to technical/.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
76cead39
J
Documentation: more examples. · 1e2ccd3a
由 Junio C Hamano 提交于 12月 12, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
1e2ccd3a
J
Everyday: a bit more example. · 180c4746
由 Junio C Hamano 提交于 12月 12, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
180c4746

diffcore-break: do not break too small filepair. · 0532a5e4

由 Junio C Hamano 提交于 12月 12, 2005

Somehow we checked only one side and not the other.  By checking
the filesize upfront, we can bypass generating delta
unnecessarily.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

0532a5e4

Revert "Add deltifier test." · 86c95233

由 Junio C Hamano 提交于 12月 12, 2005

This reverts e726715a commit,
because reverting diff-delta emptiness change would break this test.

86c95233

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

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