提交 · 3ae854c3567dd10055fbe12b8bd91bd2d447f55f · 李少辉-开发者 / git

17 12月, 2005 1 次提交

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

Morten Welinder says examples of resetting is really about
recovering from botched commit/pulls.  I agree that pointers
from commands that cause a reset to be needed in the first place
would be very helpful.

Also reset examples did not mention "pull/merge" cases.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

3ae854c3

16 12月, 2005 9 次提交

J
refs.c: off-by-one fix. · 06bf6ac4
由 Junio C Hamano 提交于 12月 15, 2005
```
Signed-off-by: NJunio C Hamano <junkio@cox.net>
```
06bf6ac4

We do not like "HEAD" as a new branch name · ee34518d

由 Johannes Schindelin 提交于 12月 16, 2005

This makes git-check-ref-format fail for "HEAD". Since the check is only
executed when creating refs, the existing symbolic ref is safe.

Otherwise these commands, most likely are pilot errors, would do
pretty funky stuff:

	git checkout -b HEAD
	git pull . other:HEAD
Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

ee34518d

Sort globbed refname in show-branch. · 06d900cf

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

"git show-branch bugs/*" shows all branches whose name match the
specified pattern, but in the order readdir() happened to
returned.  Sort them to make the output more predictable.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

06d900cf

small cleanup for diff-delta.c · e5e3a9d8

由 Nicolas Pitre 提交于 12月 15, 2005

This patch removes unused remnants of the original xdiff source.
No functional change.  Possible tiny speed improvement.
Signed-off-by: NNicolas Pitre <nico@cam.org>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

e5e3a9d8

git-whatchanged: Add usage string · 1403959c

由 Fredrik Kuivinen 提交于 12月 15, 2005

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

1403959c

git-log: Add usage string · 2a58a9a9

由 Fredrik Kuivinen 提交于 12月 15, 2005

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

2a58a9a9

git-diff: Usage string clean-up · 92811b57

由 Fredrik Kuivinen 提交于 12月 15, 2005

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

92811b57

applymbox: typofix · c6f60f99

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

Sorry, I broke this command completely with the stupid typo.

Noticed by Marco Costalba.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

c6f60f99

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 18 次提交

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

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

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