提交 · 09f8d055f9c2af79a72f8d2a2f13698d9bbe6956 · 李少辉-开发者 / git

26 7月, 2008 10 次提交

git-am: Mention --abort in usage string part of OPTIONS_SPEC · 09f8d055

由 Stephan Beyer 提交于 7月 25, 2008

The three separate lines for --skip, --resolved and --abort
are merged into one so that it is easy to see that they're
alternative and related options.
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

09f8d055

Propagate -u/--upload-pack option of "git clone" to transport. · 837c8767

由 Steve Haslam 提交于 7月 25, 2008

The -u option to override the remote system's path to git-upload-pack was
being ignored by "git clone"; caused by a missing call to
transport_set_option to set TRANS_OPT_UPLOADPACK. Presumably this crept in
when git-clone was converted from shell to C.
Signed-off-by: NSteve Haslam <shaslam@lastminute.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

837c8767

editor.c: Libify launch_editor() · 7198203a

由 Stephan Beyer 提交于 7月 25, 2008

This patch removes exit()/die() calls and builtin-specific messages
from launch_editor(), so that it can be used as a general libgit.a
function to launch an editor.
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

7198203a

Move launch_editor() from builtin-tag.c to editor.c · d82f33e2

由 Stephan Beyer 提交于 7月 25, 2008

launch_editor() is declared in strbuf.h but defined in builtin-tag.c.
This patch moves launch_editor() into a new source file editor.c,
but keeps the declaration in strbuf.h.
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

d82f33e2

Merge branch 'maint' · d9d9e6ee

由 Junio C Hamano 提交于 7月 25, 2008

* maint:
  Makefile: fix shell quoting
  tests: propagate $(TAR) down from the toplevel Makefile
  index-pack.c: correctly initialize appended objects
  send-email: find body-encoding correctly

d9d9e6ee

J
Documentation: clarify how to disable elements in core.whitespace · c921cc92
由 Junio C Hamano 提交于 7月 25, 2008
```
Noticed by Peter Valdemar Mørch.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
c921cc92

Makefile: fix shell quoting · bfce5087

由 Junio C Hamano 提交于 7月 25, 2008

Makefile records paths to a few programs in GIT-BUILD-OPTIONS file.  These
paths need to be quoted twice: once to protect specials from the shell
that runs the generated GIT-BUILD-OPTIONS file, and again to protect them
(and the first level of quoting itself) from the shell that runs the
"echo" inside the Makefile.

You can test this by trying:

    $ ln -s /bin/tar "$HOME/Tes' program/tar"
    $ make TAR="$HOME/Tes' program/tar" test
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

bfce5087

J
tests: propagate $(TAR) down from the toplevel Makefile · c30e699f
由 Junio C Hamano 提交于 7月 25, 2008
```
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
c30e699f

index-pack.c: correctly initialize appended objects · 72de2883

由 Björn Steinbrink 提交于 7月 24, 2008

When index-pack completes a thin pack it appends objects to the pack.
Since the commit 92392b4a(index-pack: Honor core.deltaBaseCacheLimit when
resolving deltas) such an object can be pruned in case of memory
pressure, and will be read back again by get_data_from_pack().  For this
to work, the fields in object_entry structure need to be initialized
properly.

Noticed by Pierre Habouzit.
Signed-off-by: NBjörn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: NNicolas Pitre <nico@cam.org>
Acked-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

72de2883

send-email: find body-encoding correctly · 8892048d

由 Peter Valdemar Mørch 提交于 7月 25, 2008

In 8291db6f (git-send-email: add charset header if we add encoded 'From',
2007-11-16), "$1" is used from a regexp without using () to capture
anything in $1. Later, when that value was used, it causes a warning about
a variable being undefined, instead of using the correct value for
comparison (not that it makes difference in the current code that does not
do actual re-encoding).
Signed-off-by: NPeter Valdemar Mørch <peter@morch.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

8892048d

25 7月, 2008 8 次提交

document that git-tag can tag more than heads · a2d07d80

由 Jonathan Nieder 提交于 7月 24, 2008

After looking the git-tag manpage, someone on #git wondered how
to tag a commit that is not a branch head.  This patch changes
the synopsis to say "<commit> | <object>" instead of "<head>" to
address his question.

Samuel Bronson had the idea of putting "<commit> | <object>"
for "<object>" because most tags point to commits (and for the
rest of the manpage, all tags point to commits).
Signed-off-by: NJonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a2d07d80

perl/Makefile: update NO_PERL_MAKEMAKER section · 058fb414

由 Brandon Casey 提交于 7月 22, 2008

The perl modules must be copied to blib/lib so they are available for
testing.
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

058fb414

bash: offer only paths after '--' for 'git checkout' · c84bb14c

由 SZEDER Gábor 提交于 7月 23, 2008

Commit d773c631 (bash: offer only paths after '--', 2008-07-08) did the
same for several other git commands, but 'git checkout' went unnoticed.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

c84bb14c

checkout: mention '--' in the docs · b302ddd2

由 SZEDER Gábor 提交于 7月 23, 2008

'git checkout' uses '--' to separate options from paths, but it was not
mentioned in the documentation
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

b302ddd2

Merge branch 'ph/checkout' · 99ea66ec

由 Junio C Hamano 提交于 7月 24, 2008

* ph/checkout:
  git-checkout: improve error messages, detect ambiguities.
  git-checkout: fix command line parsing.

99ea66ec

git-checkout: improve error messages, detect ambiguities. · 859fdaba

由 Pierre Habouzit 提交于 7月 23, 2008

The patch is twofold: it moves the option consistency checks just under
the parse_options call so that it doesn't get in the way of the tree
reference vs. pathspecs desambiguation.

The other part rewrites the way to understand arguments so that when
git-checkout fails it does with an understandable message. Compared to the
previous behavior we now have:

  - a better error message when doing:

        git checkout <blob reference> --

    now complains about the reference not pointing to a tree, instead of
    things like:

        error: pathspec <blob reference> did not match any file(s) known to git.
        error: pathspec '--' did not match any file(s) known to git.

  - a better error message when doing:

        git checkout <path> --

    It now complains about <path> not being a reference instead of the
    completely obscure:

        error: pathspec '--' did not match any file(s) known to git.

  - an error when -- wasn't used, and the first argument is ambiguous
    (i.e. can be interpreted as both ref and as path).
Signed-off-by: NPierre Habouzit <madcoder@debian.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

859fdaba

O
update test case to protect am --skip behaviour · 9944d1a0
由 Olivier Marin 提交于 7月 24, 2008
```
Signed-off-by: NOlivier Marin <dkr@freesurf.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
9944d1a0

Teach fsck and prune about the new location of temporary objects · 0e8316cc

由 Brandon Casey 提交于 7月 24, 2008

Since 5723fe7e, temporary objects are now created in their final destination
directories, rather than in .git/objects/. Teach fsck to recognize and
ignore the temporary objects it encounters, and teach prune to remove them.
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

0e8316cc

24 7月, 2008 22 次提交

J
Merge branch 'maint' into ph/checkout · 65360346
由 Junio C Hamano 提交于 7月 23, 2008
```
* maint:
  git-checkout: fix command line parsing.
```
65360346
S
Make non-static functions, that may be static, static · 186458b1
由 Stephan Beyer 提交于 7月 24, 2008
```
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
```
186458b1

ignore non-existent refs in dwim_log() · 0c4cd7f4

由 Junio C Hamano 提交于 7月 23, 2008

f2eba66d (Enable HEAD@{...} and make it independent from the current
branch, 2007-02-03) introduced dwim_log() to handle <refname>@{...}
syntax, and as part of its processing, it checks if the ref exists by
calling refsolve_ref(). It should call it as a reader to make sure the
call returns NULL for a nonexistent ref (not as a potential writer in
which case it does not return NULL).
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

0c4cd7f4

git-completion.bash: provide completion for 'show-branch' · 2ca880fe

由 Thomas Rast 提交于 7月 23, 2008

It previously used the same as 'log', but the options are quite
different and the arguments must be single refs (or globs).
Signed-off-by: NThomas Rast <trast@student.ethz.ch>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

2ca880fe

bash completion: Add long options for 'git rm' · 08c701d4

由 Lee Marlow 提交于 7月 23, 2008

Options added: --cached --dry-run --ignore-unmatch --quiet
Signed-off-by: NLee Marlow <lee.marlow@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

08c701d4

svnimport: newer libsvn wants us to ask for the root with "", not "/" · e8a43a13

由 P. Christeas 提交于 7月 23, 2008

In r27729, libsvn introduced an assert which explicitly
forbids searching the tree at "/". Luckily enough, it
still accepts an empty string "" as the starting point.

http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_ra/ra_loader.c?r1=27653&r2=27729

Tested against libsvn0-1.5.0-4mdv2009.0 (needs the fix),
libsvn0-1.4.6-5mdv2008.1 (works anyway)
Signed-off-by: NP. Christeas <p_christ@hol.gr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

e8a43a13

Documentation/git-filter-branch: teach "rm" instead of "update-index --remove" · eb72a514

由 Petr Baudis 提交于 7月 23, 2008

The example to remove paths using index-filter was done with
"git update-index --remove"; "git rm --cached" would be more familiar to
new people and is sufficient for this particular case.
Signed-off-by: NPetr Baudis <pasky@suse.cz>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

eb72a514

git daemon: avoid waking up too often · f9bbefc7

由 Johannes Schindelin 提交于 7月 22, 2008

To avoid waking up unnecessarily, a pipe is set up that is only ever
written to by child_handler(), when a child disconnects, as suggested
per Junio.

This avoids waking up the main process every second to see if a child
was disconnected.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

f9bbefc7

builtin-commit: Two trivial style-cleanups · 3b6aeb3c

由 Johannes Schindelin 提交于 7月 22, 2008

Pierre Habouzit noticed that two variables were not static which should
have been, and that adding "\n\n" is better than adding '\n' twice.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

3b6aeb3c

Documentation: clarify diff --cc · ea3d988d

由 Junio C Hamano 提交于 7月 23, 2008

The definition of an "uninteresting" hunk was not in line with reality.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

ea3d988d

am --abort: Add to bash-completion and mention in git-rerere documentation · a31c00b0

由 Stephan Beyer 提交于 7月 23, 2008

The git-rerere documentation talks about commands that invoke
"git rerere clear" automatically. git am --abort is added and
a typo is fixed additionally.
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a31c00b0

git-filter-branch.sh: Allow running in bare repositories · a4661b01

由 Petr Baudis 提交于 7月 24, 2008

Commit 46eb449c restricted git-filter-branch to non-bare repositories
unnecessarily; git-filter-branch can work on bare repositories just
fine.

Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NPetr Baudis <pasky@suse.cz>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a4661b01

builtin-branch.c: optimize --merged and --no-merged · 68067ca1

由 Junio C Hamano 提交于 7月 23, 2008

"git branch --no-merged $commit" used to compute the merge base between
the tip of each and every branch with the named $commit, but this was
wasteful when you have many branches.  Inside append_ref() we literally
ran has_commit() between the tip of the branch and the merge_filter_ref.

Instead, we can let the revision machinery traverse the history as if we
are running:

    $ git rev-list --branches --not $commit

by queueing the tips of branches we encounter as positive refs (this
mimicks the "--branches" option in the above command line) and then
appending the merge_filter_ref commit as a negative one, and finally
calling prepare_revision_walk() to limit the list..

After the traversal is done, branch tips that are reachable from $commit
are painted UNINTERESTING; they are already fully contained in $commit
(i.e. --merged).  Tips that are not painted UNINTERESTING still have
commits that are not reachable from $commit, thus "--no-merged" will show
them.

With an artificial repository that has "master" and 1000 test-$i branches
where they were created by "git branch test-$i master~$i":

    (with patch)
    $ /usr/bin/time git-branch --no-merged master >/dev/null
    0.12user 0.02system 0:00.15elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    0inputs+0outputs (0major+1588minor)pagefaults 0swaps

    $ /usr/bin/time git-branch --no-merged test-200 >/dev/null
    0.15user 0.03system 0:00.18elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
    0inputs+0outputs (0major+1711minor)pagefaults 0swaps

    (without patch)
    $ /usr/bin/time git-branch --no-merged master >/dev/null
    0.69user 0.03system 0:00.72elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
    0inputs+0outputs (0major+2229minor)pagefaults 0swaps

    $ /usr/bin/time git-branch --no-merged test-200 >/dev/null
    0.58user 0.03system 0:00.61elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
    0inputs+0outputs (0major+2248minor)pagefaults 0swaps
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

68067ca1

builtin-branch.c: remove unused code in append_ref() callback function · 0f31d680

由 Junio C Hamano 提交于 7月 23, 2008

We let for_each_ref() to feed all refs to append_ref() but we are only
ever interested in local or remote tracking branches.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

0f31d680

stash save: fix parameter handling · 47629dcf

由 Junio C Hamano 提交于 7月 23, 2008

A command line "git stash save --keep-index I was doing this" was
misparsed and keep-index codepath did not trigger.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

47629dcf

git-am: Add colon before the subject that is printed out as being applied · c8fe1980

由 Stephan Beyer 提交于 7月 23, 2008

git-am output can be confusing, because the subject of the applied
patch can look like the rest of a sentence starting with "Applying".
The added colon should make this clearer.
Signed-off-by: NStephan Beyer <s-beyer@gmx.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

c8fe1980

git-checkout: fix command line parsing. · f5242ebf

由 Pierre Habouzit 提交于 7月 23, 2008

This fixes an issue when you use:

    $ git checkout -- <path1> [<paths>...]

and that <path1> can also be understood as a reference. git-checkout
mistakenly understands this as the same as:

    $ git checkout <path1> -- [<paths>...]

because parse-options was eating the '--' and the argument parser thought
he was parsing:

    $ git checkout <path1> [<paths>...]

Where there indeed is an ambiguity
Signed-off-by: NPierre Habouzit <madcoder@debian.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

f5242ebf

rebase -i: When an 'edit' stops, mention the commit · a8ccc204

由 Johannes Sixt 提交于 7月 23, 2008

In a rebase session where more than one commit is to be 'edit'ed, and the
user spends considerable time to 'edit' a commit, it is easy to forget what
one wanted to 'edit' at the individual commits. It would be helpful to see
at which commit the rebase stopped.

Incidentally, if the rebase stopped due to merge conflicts or other errors,
the commit was already reported ("Could not apply $sha1..."), but when
rebase stopped after successfully applying an "edit" commit, it would not
mention it. With this change the commit is reported.
Signed-off-by: NJohannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

a8ccc204

sort_in_topological_order(): avoid setting a commit flag · e358f3c3

由 Johannes Schindelin 提交于 7月 23, 2008

We used to set the TOPOSORT flag of commits during the topological
sorting, but we can just as well use the member "indegree" for it:
indegree is now incremented by 1 in the cases where the commit used
to have the TOPOSORT flag.

This is the same behavior as before, since indegree could not be
non-zero when TOPOSORT was unset.

Incidentally, this fixes the bug in show-branch where the 8th column
was not shown: show-branch sorts the commits in topological order,
assuming that all the commit flags are available for show-branch's
private matters.

But this was not true: TOPOSORT was identical to the flag corresponding
to the 8th ref.  So the flags for the 8th column were unset by the
topological sorting.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

e358f3c3

Add test to show that show-branch misses out the 8th column · ce567d18

由 Johannes Schindelin 提交于 7月 23, 2008

Noticed by Pasky.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

ce567d18

Ignore dirty submodule states in "git pull --rebase" · 7d90c8ee

由 Johannes Schindelin 提交于 7月 22, 2008

This is a companion patch to 6848d58c(Ignore dirty submodule states
during rebase and stash).
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

7d90c8ee

t/t4202-log.sh: add newline at end of file · c65233fe

由 Brandon Casey 提交于 7月 22, 2008

Some shells hang when parsing the script if the last statement is not
followed by a newline. So add one.
Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

c65233fe

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

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