git.git
16 years agoparse-options.c: make check_typos() static
Nanako Shiraishi [Wed, 16 Jul 2008 10:42:18 +0000 (19:42 +0900)]
parse-options.c: make check_typos() static

This function is not used by any other file.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobuiltin-describe.c: make a global variable "pattern" static
Nanako Shiraishi [Wed, 16 Jul 2008 10:42:14 +0000 (19:42 +0900)]
builtin-describe.c: make a global variable "pattern" static

This variable is not used by any other file.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agocache-tree.c: make cache_tree_find() static
Nanako Shiraishi [Wed, 16 Jul 2008 10:42:10 +0000 (19:42 +0900)]
cache-tree.c: make cache_tree_find() static

This function is not used by any other file.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot/aggregate-results: whitespace fix
Junio C Hamano [Wed, 16 Jul 2008 15:42:52 +0000 (08:42 -0700)]
t/aggregate-results: whitespace fix

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"
Eric Wong [Mon, 14 Jul 2008 09:13:56 +0000 (02:13 -0700)]
t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'mv/merge-in-c'
Junio C Hamano [Wed, 16 Jul 2008 02:09:46 +0000 (19:09 -0700)]
Merge branch 'mv/merge-in-c'

* mv/merge-in-c:
  reduce_heads(): protect from duplicate input
  reduce_heads(): thinkofix
  Add a new test for git-merge-resolve
  t6021: add a new test for git-merge-resolve
  Teach merge.log to "git-merge" again
  Build in merge
  Fix t7601-merge-pull-config.sh on AIX
  git-commit-tree: make it usable from other builtins
  Add new test case to ensure git-merge prepends the custom merge message
  Add new test case to ensure git-merge reduces octopus parents when possible
  Introduce reduce_heads()
  Introduce get_merge_bases_many()
  Add new test to ensure git-merge handles more than 25 refs.
  Introduce get_octopus_merge_bases() in commit.c
  git-fmt-merge-msg: make it usable from other builtins
  Move read_cache_unmerged() to read-cache.c
  Add new test to ensure git-merge handles pull.twohead and pull.octopus
  Move parse-options's skip_prefix() to git-compat-util.h
  Move commit_list_count() to commit.c
  Move split_cmdline() to alias.c

Conflicts:
Makefile
parse-options.c

16 years agoMerge branch 'ag/rewrite_one'
Junio C Hamano [Wed, 16 Jul 2008 01:59:48 +0000 (18:59 -0700)]
Merge branch 'ag/rewrite_one'

* ag/rewrite_one:
  Fix quadratic performance in rewrite_one.

16 years agoMerge branch 'sp/win'
Junio C Hamano [Wed, 16 Jul 2008 01:59:45 +0000 (18:59 -0700)]
Merge branch 'sp/win'

* sp/win:
  We need to check for msys as well as Windows in add--interactive.
  Convert CR/LF to LF in tag signatures
  Fixed text file auto-detection: treat EOF character 032 at the end of file as printable

16 years agoMerge branch 'js/more-win'
Junio C Hamano [Wed, 16 Jul 2008 01:59:28 +0000 (18:59 -0700)]
Merge branch 'js/more-win'

* js/more-win:
  help (Windows): Display HTML in default browser using Windows' shell API
  help.c: Add support for htmldir relative to git_exec_path()
  Move code interpreting path relative to exec-dir to new function system_path()

16 years agoMerge branch 'js/maint-pretty-mailmap'
Junio C Hamano [Wed, 16 Jul 2008 01:59:04 +0000 (18:59 -0700)]
Merge branch 'js/maint-pretty-mailmap'

* js/maint-pretty-mailmap:
  Add pretty format %aN which gives the author name, respecting .mailmap

16 years agoRename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Johannes Schindelin [Wed, 16 Jul 2008 01:33:44 +0000 (03:33 +0200)]
Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

Since the files generated and used during a rebase are never to be
tracked, they should live in $GIT_DIR.  While at it, avoid the rather
meaningless term "dotest" to "rebase", and unhide ".dotest-merge".

This was wished for on the mailing list, but so far unimplemented.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoUpdate draft release notes to 1.6.0
Junio C Hamano [Tue, 15 Jul 2008 12:55:55 +0000 (05:55 -0700)]
Update draft release notes to 1.6.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoshortlog: support --pretty=format: option
Johannes Schindelin [Mon, 14 Jul 2008 18:08:52 +0000 (19:08 +0100)]
shortlog: support --pretty=format: option

With this patch, the user can override the default setting, to print
the commit messages using a user format instead of the onelines of the
commits.  Example:

$ git shortlog --pretty='format:%s (%h)' <commit>..

Note that shortlog will only respect a user format setting, as the other
formats do not make much sense.

Wished for by Andrew Morton.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMake git-add -i accept ranges like 7-
Ciaran McCreesh [Mon, 14 Jul 2008 18:29:37 +0000 (19:29 +0100)]
Make git-add -i accept ranges like 7-

git-add -i ranges expect number-number. But for the supremely lazy, typing in
that second number when selecting "from patch 7 to the end" is wasted effort.
So treat an empty second number in a range as "until the last item".

Signed-off-by: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot9600: allow testing with cvsps 2.2, including beta versions
Pavel Roskin [Tue, 15 Jul 2008 00:20:19 +0000 (20:20 -0400)]
t9600: allow testing with cvsps 2.2, including beta versions

We've supported cvsps 2.1 so far.  Newer 2.2b1 (beta) seems to work with
us, too.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge git://repo.or.cz/git-gui
Junio C Hamano [Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)]
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: MERGE_RR lives in .git/ directly with newer Git versions
  git-gui: Exit shortcut in MacOSX repaired

16 years agoMerge branch 'js/merge-rr'
Junio C Hamano [Tue, 15 Jul 2008 06:48:48 +0000 (23:48 -0700)]
Merge branch 'js/merge-rr'

* js/merge-rr:
  Move MERGE_RR from .git/rr-cache/ into .git/

Conflicts:
builtin-rerere.c

16 years agoMerge branch 'sb/rerere-lib'
Junio C Hamano [Tue, 15 Jul 2008 06:47:48 +0000 (23:47 -0700)]
Merge branch 'sb/rerere-lib'

* sb/rerere-lib:
  rerere: Separate libgit and builtin functions

16 years agoMerge branch 'ls/maint-mailinfo-patch-label'
Junio C Hamano [Tue, 15 Jul 2008 06:47:23 +0000 (23:47 -0700)]
Merge branch 'ls/maint-mailinfo-patch-label'

* ls/maint-mailinfo-patch-label:
  git-mailinfo: Fix getting the subject from the in-body [PATCH] line

16 years agoMerge branch 'om/rerere-careful'
Junio C Hamano [Tue, 15 Jul 2008 06:47:14 +0000 (23:47 -0700)]
Merge branch 'om/rerere-careful'

* om/rerere-careful:
  builtin-rerere: more carefully find conflict markers

16 years agoMerge branch 'jc/branch-merged'
Junio C Hamano [Tue, 15 Jul 2008 06:47:01 +0000 (23:47 -0700)]
Merge branch 'jc/branch-merged'

* jc/branch-merged:
  branch --merged/--no-merged: allow specifying arbitrary commit
  branch --contains: default to HEAD
  parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

Conflicts:
Documentation/git-branch.txt

16 years agoMerge branch 'jc/rebase-orig-head'
Junio C Hamano [Tue, 15 Jul 2008 06:45:49 +0000 (23:45 -0700)]
Merge branch 'jc/rebase-orig-head'

* jc/rebase-orig-head:
  Documentation: mention ORIG_HEAD in am, merge, and rebase
  Teach "am" and "rebase" to mark the original position with ORIG_HEAD

16 years agobash completion: Remove dashed command completion support
Shawn O. Pearce [Tue, 15 Jul 2008 05:58:06 +0000 (05:58 +0000)]
bash completion: Remove dashed command completion support

Since only 'git' and 'gitk' are in the user's $PATH now we do not
expect users to need completion support for git-fetch, and expect
they will instead rely upon the completion support for 'git fetch'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'sp/maint-bash-completion-optim'
Junio C Hamano [Tue, 15 Jul 2008 06:36:08 +0000 (23:36 -0700)]
Merge branch 'sp/maint-bash-completion-optim'

* sp/maint-bash-completion-optim:
  bash completion: Resolve git show ref:path<tab> losing ref: portion
  bash completion: Append space after file names have been completed

16 years agorestore legacy behavior for read_sha1_file()
Nicolas Pitre [Tue, 15 Jul 2008 01:46:48 +0000 (21:46 -0400)]
restore legacy behavior for read_sha1_file()

Since commit 8eca0b47ff1598a6d163df9358c0e0c9bd92d4c8, it is possible
for read_sha1_file() to return NULL even with existing objects when they
are corrupted.  Previously a corrupted object would have terminated the
program immediately, effectively making read_sha1_file() return NULL
only when specified object is not found.

Let's restore this behavior for all users of read_sha1_file() and
provide a separate function with the ability to not terminate when
bad objects are encountered.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobash: Add long option completion for 'git send-email'
Teemu Likonen [Mon, 14 Jul 2008 08:21:02 +0000 (11:21 +0300)]
bash: Add long option completion for 'git send-email'

Add the following long options to be completed with 'git send-email':

    --bcc --cc --cc-cmd --chain-reply-to --compose --dry-run
    --envelope-sender --from --identity --in-reply-to
    --no-chain-reply-to --no-signed-off-by-cc --no-suppress-from
    --no-thread --quiet --signed-off-by-cc --smtp-pass --smtp-server
    --smtp-server-port --smtp-ssl --smtp-user --subject --suppress-cc
    --suppress-from --thread --to

Short ones like --to and --cc are not usable for actual completion
because of the shortness itself and because there are longer ones which
start with same letters (--thread, --compose). It's still useful to have
these shorter options _listed_ when user presses TAB key after typing
two dashes. It gives user an idea what options are available (and --to
and --cc are probably the most commonly used).

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-submodule - register submodule URL if adding in place
Mark Levedahl [Thu, 10 Jul 2008 01:05:41 +0000 (21:05 -0400)]
git-submodule - register submodule URL if adding in place

When adding a new submodule in place, meaning the user created the
submodule as a git repo in the superproject's tree first, we don't go
through "git submodule init" to register the module.  Thus, the
submodule's origin repository URL is not stored in .git/config, and no
subsequent submodule operation will ever do so.  In this case, assume the
URL the user supplies to "submodule add" is the one that should be
registered, and do so.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-submodule - make "submodule add" more strict, and document it
Mark Levedahl [Thu, 10 Jul 2008 01:05:40 +0000 (21:05 -0400)]
git-submodule - make "submodule add" more strict, and document it

This change makes "submodule add" much more strict in the arguments it
takes, and is intended to address confusion as recently noted on the
git-list. With this change, the required syntax is:

$ git submodule add URL path

Specifically, this eliminates the form

$ git submodule add URL

which was confused by more than one person as

$ git submodule add path

With this patch, the URL locating the submodule's origin repository can be
either an absolute URL, or (if it begins with ./ or ../) can express the
submodule's repository location relative to the superproject's origin.

This patch also eliminates a third form of URL, which was relative to the
superproject's top-level directory (not its repository).  Any URL that was
neither absolute nor matched ./*|../* was assumed to point to a
subdirectory of the superproject as the location of the submodule's origin
repository.  This URL form was confusing and does not seem to correspond
to an important use-case.  Specifically, no-one has identified the need to
clone from a repository already in the superproject's tree, but if this is
needed it is easily done using an absolute URL: $(pwd)/relative-path.  So,
no functionality is lost with this patch. (t6008-rev-list-submodule.sh did
rely upon this relative URL, fixed by using $(pwd).)

Following this change, there are exactly four variants of
submodule-add, as both arguments have two flavors:

URL can be absolute, or can begin with ./|../ and thus names the
submodule's origin relative to the superproject's origin.

Note: With this patch, "submodule add" discerns an absolute URL as
matching /*|*:*: e.g., URL begins with /, or it contains a :.  This works
for all valid URLs, an absolute path in POSIX, as well as an absolute path
on Windows).

path can either already exist as a valid git repo, or will be cloned from
the given URL.  The first form here eases creation of a new submodule in
an existing superproject as the submodule can be added and tested in-tree
before pushing to the public repository.  However, the more usual form is
the second, where the repo is cloned from the given URL.

This specifically addresses the issue of

$ git submodule add a/b/c

attempting to clone from a repository at "a/b/c" to create a new module
in "c". This also simplifies description of "relative URL" as there is now
exactly *one* form: a URL relative to the parent's origin repo.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-svn: typofix
Frederik Schwarzer [Mon, 14 Jul 2008 16:30:24 +0000 (18:30 +0200)]
git-svn: typofix

Signed-off-by: Frederik Schwarzer <schwarzerf@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-svn: find-rev and rebase for SVN::Mirror repositories
João Abecasis [Mon, 14 Jul 2008 15:28:04 +0000 (16:28 +0100)]
git-svn: find-rev and rebase for SVN::Mirror repositories

find-rev and rebase error out on svm because git-svn doesn't trace the
original svn revision numbers back to git commits. The updated test
case, included in the patch, shows the issue and passes with the rest of
the patch applied.

This fixes Git::SVN::find_by_url to find branches based on the
svm:source URL, where useSvmProps is set. Also makes sure cmd_find_rev
and working_head_info use the information they have to correctly track
the source repository. This is enough to get find-rev and rebase
working.

Signed-off-by: João Abecasis <joao@abecasis.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agotutorial: clarify "pull" is "fetch + merge"
Junio C Hamano [Thu, 10 Jul 2008 21:01:57 +0000 (14:01 -0700)]
tutorial: clarify "pull" is "fetch + merge"

The document says that a fetch with a configured remote stores what are
fetched in the remote tracking branches "Unlike the longhand form", but
there is no longhand form "fetch" demonstrated earlier.

This adds a missing demonstration of the longhand form, and a new
paragraph to explain why some people might want to fetch before pull.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agotutorial: use prompt with user names in example, to clarify who is doing what
Ian Katz [Thu, 10 Jul 2008 18:27:30 +0000 (14:27 -0400)]
tutorial: use prompt with user names in example, to clarify who is doing what

Signed-off-by: Ian Katz <ifreecarve@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobash completion: Resolve git show ref:path<tab> losing ref: portion
Shawn O. Pearce [Tue, 15 Jul 2008 05:52:04 +0000 (05:52 +0000)]
bash completion: Resolve git show ref:path<tab> losing ref: portion

Linus reported that the bash completion for git show often dropped
the ref portion of the argument (stuff before the :) when trying
to complete a file name of a file in another branch or tag.

Björn Steinbrink tracked it down to the gvfs completion script
which comes standard on many Fedora Core based systems.  That is
removing : from COMP_WORDBREAKS, making readline treat the entire
argument (including the ref) as the name that must be completed.
When the git completion routines supplied a completion of just the
filename, readline replaced everything.

Since Git users often need to use "ref:path" or "ref:ref" sort of
arguments, and expect completion support on both sides of the :
we really want the : in COMP_WORDBREAKS to provide a good user
experience.  This is also the default that ships with bash as it
can be useful in other contexts, such as rcp/scp.

We now try to add : back to COMP_WORDBREAKS if it has been removed
by a script that loaded before us.  However if this doesn't work
(as the : is stripped after we load) we fallback in the completion
routines to include "ref:" as part of the prefix for completions,
allowing readine to fully insert the argument the user wanted.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoreduce_heads(): protect from duplicate input
Junio C Hamano [Mon, 14 Jul 2008 07:09:41 +0000 (00:09 -0700)]
reduce_heads(): protect from duplicate input

Because we do not try computing merge base with itself for obvious
reasons, the code was not prepared for an arguably insane case of
the caller feeding the same commit twice to it.

Noticed and test written by Sverre Hvammen Johansen

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoUpdate draft release notes for 1.6.0
Junio C Hamano [Mon, 14 Jul 2008 05:30:35 +0000 (22:30 -0700)]
Update draft release notes for 1.6.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobash completion: Append space after file names have been completed
Shawn O. Pearce [Mon, 14 Jul 2008 00:22:03 +0000 (00:22 +0000)]
bash completion: Append space after file names have been completed

When completing `git show origin/maint:Makef<tab>` we should add a
space after the filename has been completed, so that the user can
immediately begin the next argument.

I also added a special case for the symlink variant so we treat it
just like a normal blob, as there are no items below it in the Git
tree structure.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-mailinfo: Fix getting the subject from the in-body [PATCH] line
Lukas Sandström [Thu, 10 Jul 2008 21:41:33 +0000 (23:41 +0200)]
git-mailinfo: Fix getting the subject from the in-body [PATCH] line

"Subject: " isn't in the static array "header", and thus
memcmp("Subject:", header[i], 7) will never match.

Even if it did so, hdr_data[] may not have been allocated if there weren't
a "Subject: " in-body when we process "[PATCH]" in the affected codepath.

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'sp/maint-bash-completion-optim'
Junio C Hamano [Sun, 13 Jul 2008 23:41:02 +0000 (16:41 -0700)]
Merge branch 'sp/maint-bash-completion-optim'

* sp/maint-bash-completion-optim:
  bash completion: Don't offer "a.." as a completion for "a."
  bash completion: Improve responsiveness of git-log completion

16 years agobash completion: Don't offer "a.." as a completion for "a."
Shawn O. Pearce [Sun, 13 Jul 2008 22:06:31 +0000 (22:06 +0000)]
bash completion: Don't offer "a.." as a completion for "a."

If the user is trying to complete "v1.5.3.<tab>" to see all of
the available maintenance releases for 1.5.3 we should not give
them an extra dot as the completion.  Instead if the user wants
a ".." or a "..." operator they should key the two dots out on
their own.  Its the same number of keystrokes either way.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-request-pull: replace call to deprecated peek-remote
Ramsay Jones [Tue, 8 Jul 2008 23:32:15 +0000 (00:32 +0100)]
git-request-pull: replace call to deprecated peek-remote

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMake rebase--interactive use OPTIONS_SPEC
Stephan Beyer [Sat, 12 Jul 2008 15:48:20 +0000 (17:48 +0200)]
Make rebase--interactive use OPTIONS_SPEC

Also add some checks that --continue/--abort/--skip
actions are used without --onto, -p, -t, etc.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot3404: test two "preserve merges with -p" cases
Stephan Beyer [Sat, 12 Jul 2008 15:47:31 +0000 (17:47 +0200)]
t3404: test two "preserve merges with -p" cases

There are two cases for preserving merges:

  1. The merge base is outside the trunk that is to be rebased.
     Then commits of those other parents must not be picked.

  2. The merge base is inside the trunk that is to be rebased.
     Then all the commits related to that merge must be picked
     and the merge must be redone.

The "preserve merges with -p" test case tested for case 1 only.
This patch adds case 2.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-am/git-mailsplit: correct synopsis for reading from stdin
Stephan Beyer [Sat, 12 Jul 2008 15:47:16 +0000 (17:47 +0200)]
git-am/git-mailsplit: correct synopsis for reading from stdin

Invoking git-am or git-mailsplit without mbox or Maildir results in
reading an mbox from stdin.  Mention this in the synopsis and usage
strings.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'maint' to sync with 1.5.6.3
Junio C Hamano [Sun, 13 Jul 2008 22:45:38 +0000 (15:45 -0700)]
Merge branch 'maint' to sync with 1.5.6.3

* maint:
  GIT 1.5.6.3
  git-am: Do not exit silently if committer is unset
  t0004: fix timing bug
  git-mailinfo: document the -n option
  Fix backwards-incompatible handling of core.sharedRepository

16 years agoGIT 1.5.6.3 v1.5.6.3
Junio C Hamano [Sun, 13 Jul 2008 22:23:43 +0000 (15:23 -0700)]
GIT 1.5.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'ph/parseopt-step-blame'
Junio C Hamano [Sun, 13 Jul 2008 22:16:35 +0000 (15:16 -0700)]
Merge branch 'ph/parseopt-step-blame'

* ph/parseopt-step-blame:
  revisions: refactor handle_revision_opt into parse_revision_opt.
  git-shortlog: migrate to parse-options partially.
  git-blame: fix lapsus
  git-blame: migrate to incremental parse-option [2/2]
  git-blame: migrate to incremental parse-option [1/2]
  revisions: split handle_revision_opt() from setup_revisions()
  parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
  parse-opt: fake short strings for callers to believe in.
  parse-opt: do not print errors on unknown options, return -2 intead.
  parse-opt: create parse_options_step.
  parse-opt: Export a non NORETURN usage dumper.
  parse-opt: have parse_options_{start,end}.
  git-blame --reverse
  builtin-blame.c: allow more than 16 parents
  builtin-blame.c: move prepare_final() into a separate function.
  rev-list --children
  revision traversal: --children option

16 years agoMerge branch 'am/stash-branch'
Junio C Hamano [Sun, 13 Jul 2008 22:16:09 +0000 (15:16 -0700)]
Merge branch 'am/stash-branch'

* am/stash-branch:
  Add a test for "git stash branch"
  Implement "git stash branch <newbranch> <stash>"

16 years agoMerge branch 'sg/stash-k-i'
Junio C Hamano [Sun, 13 Jul 2008 22:15:27 +0000 (15:15 -0700)]
Merge branch 'sg/stash-k-i'

* sg/stash-k-i:
  Documentation: tweak use case in "git stash save --keep-index"
  stash: introduce 'stash save --keep-index' option

16 years agoMerge branch 'jc/report-tracking'
Junio C Hamano [Sun, 13 Jul 2008 22:15:23 +0000 (15:15 -0700)]
Merge branch 'jc/report-tracking'

* jc/report-tracking:
  branch -r -v: do not spit out garbage
  stat_tracking_info(): clear object flags used during counting
  git-branch -v: show the remote tracking statistics
  git-status: show the remote tracking statistics
  Refactor "tracking statistics" code used by "git checkout"

16 years agoMerge branch 'js/pick-root'
Junio C Hamano [Sun, 13 Jul 2008 22:15:13 +0000 (15:15 -0700)]
Merge branch 'js/pick-root'

* js/pick-root:
  Allow cherry-picking root commits

16 years agoMerge branch 'ab/bundle'
Junio C Hamano [Sun, 13 Jul 2008 22:15:08 +0000 (15:15 -0700)]
Merge branch 'ab/bundle'

* ab/bundle:
  Teach git-bundle to read revision arguments from stdin like git-rev-list.

16 years agoMerge branch 'tr/add-i-e'
Junio C Hamano [Sun, 13 Jul 2008 22:14:59 +0000 (15:14 -0700)]
Merge branch 'tr/add-i-e'

* tr/add-i-e:
  git-add--interactive: manual hunk editing mode
  git-add--interactive: remove hunk coalescing
  git-add--interactive: replace hunk recounting with apply --recount

16 years agogit-gui: MERGE_RR lives in .git/ directly with newer Git versions
Johannes Schindelin [Sat, 12 Jul 2008 14:56:59 +0000 (15:56 +0100)]
git-gui: MERGE_RR lives in .git/ directly with newer Git versions

Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete
it somewhere else.  Just in case somebody wants to use a newer git-gui
with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if
it exists).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
16 years agohelp (Windows): Display HTML in default browser using Windows' shell API
Steffen Prohaska [Sun, 13 Jul 2008 20:31:20 +0000 (22:31 +0200)]
help (Windows): Display HTML in default browser using Windows' shell API

The system's default browser for displaying HTML help pages is now used
directly on Windows, instead of launching git-web--browser, which
requires a Unix shell.  Avoiding MSYS' bash when possible is good
because it avoids potential path translation issues.  In this case it is
not too hard to avoid launching a shell, so let's avoid it.

The Windows-specific code is implemented in compat/mingw.c to avoid
platform-specific code in the main code base.  On Windows, open_html is
provided as a define.  If open_html is not defined, git-web--browse is
used.  This approach avoids platform-specific ifdefs by using
per-function ifdefs.  The "ifndef open_html" together with the
introductory comment should sufficiently warn developers, so that they
hopefully will not break this mechanism.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agohelp.c: Add support for htmldir relative to git_exec_path()
Steffen Prohaska [Sun, 13 Jul 2008 20:31:19 +0000 (22:31 +0200)]
help.c: Add support for htmldir relative to git_exec_path()

If htmldir (in the Makefile) is a relative path, this path will now be
interpreted relative to git_exec_path.  This can be used to create an
installation that can be moved to a different directory without
re-compiling.  The Windows installer (msysgit) is an example for such
a setup.

Note that the Makefile maps htmldir to the define GIT_HTML_PATH.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMove code interpreting path relative to exec-dir to new function system_path()
Steffen Prohaska [Sun, 13 Jul 2008 20:31:18 +0000 (22:31 +0200)]
Move code interpreting path relative to exec-dir to new function system_path()

Expanding system paths relative to git_exec_path can be used for
creating an installation that can be moved to a different directory
without re-compiling.  We use this approach for template_dir and the
system wide gitconfig.  The Windows installer (msysgit) is an example
for such a setup.

This commit moves common code to a new function system_path().  System
paths that are to be interpreted relative to git_exec_path are passed to
system_path() and the return value is used instead of the original path.
system_path() prefixes a relative path with git_exec_path and leaves
absolute paths unmodified.  For example, we now write

    template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR);

[j6t: moved from path.c to exec_cmd.c]

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoreduce_heads(): thinkofix
Sverre Hvammen Johansen [Sun, 13 Jul 2008 08:13:55 +0000 (08:13 +0000)]
reduce_heads(): thinkofix

When comparing two commit objects for equality, it is sufficient to
compare their in-core pointers because the object layer guarantees the
uniqueness.  However, comparing pointers to two "struct commit_list"
instances that point at the same commit does not make any sense.

Spotted by Sverre Hvammen Johansen who wrote an additional test to expose
the problem, fixed by Miklos Vajna.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoAdd a new test for git-merge-resolve
Miklos Vajna [Sat, 12 Jul 2008 22:33:35 +0000 (00:33 +0200)]
Add a new test for git-merge-resolve

Actually this is a simple test, just to ensure merge-resolve properly
calls read-tree. read-tree itself already has more complex tests.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot6021: add a new test for git-merge-resolve
Miklos Vajna [Sat, 12 Jul 2008 18:42:10 +0000 (20:42 +0200)]
t6021: add a new test for git-merge-resolve

It should fail properly if there are multiple merge bases, but there
were no test for this till now.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoFix quadratic performance in rewrite_one.
Alexander N. Gavrilov [Sat, 12 Jul 2008 18:00:57 +0000 (22:00 +0400)]
Fix quadratic performance in rewrite_one.

Parent commits are usually older than their children. Thus,
on each iteration of the loop in rewrite_one, add_parents_to_list
traverses all commits previously processed by the loop.
It performs very poorly in case of very long rewrite chains.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-am: Do not exit silently if committer is unset
Stephan Beyer [Sat, 12 Jul 2008 15:46:59 +0000 (17:46 +0200)]
git-am: Do not exit silently if committer is unset

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobash completion: Improve responsiveness of git-log completion
Shawn O. Pearce [Sun, 13 Jul 2008 02:37:42 +0000 (02:37 +0000)]
bash completion: Improve responsiveness of git-log completion

Junio noticed the bash completion has been taking a long time lately.
Petr Baudis tracked it down to 72e5e989b ("bash: Add space after
unique command name is completed.").  Tracing the code showed
we spent significant time inside of this loop within __gitcomp,
due to the string copying overhead.

  [28.146109654] _git common over
  [28.164791148] gitrefs in
  [28.280302268] gitrefs dir out
  [28.300939737] gitcomp in
  [28.308378112] gitcomp pre-case
* [28.313407453] gitcomp iter in
* [28.701270296] gitcomp iter out
  [28.713370786] out normal

Since __git_refs avoids this string copying by forking and using
echo we use the same trick here when we need to finish generating
the names for the caller.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMove MERGE_RR from .git/rr-cache/ into .git/
Johannes Schindelin [Sat, 12 Jul 2008 14:56:19 +0000 (15:56 +0100)]
Move MERGE_RR from .git/rr-cache/ into .git/

If you want to reuse the rerere cache in another repository, and set
a symbolic link to it, you do not want to have the two repositories
interfer with each other by accessing the _same_ MERGE_RR.

For example, if you use contrib/git-new-workdir to set up a second
working directory, and you have a conflict in one working directory,
but commit in the other working directory first, the wrong "resolution"
will be recorded.

The easy solution is to move MERGE_RR out of the rr-cache/ directory,
which also corresponds with the notion that rr-cache/ contains cached
resolutions, not some intermediate temporary states.

Noticed by Kalle Olavi Niemitalo.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot0004: fix timing bug
Junio C Hamano [Sat, 12 Jul 2008 11:15:56 +0000 (04:15 -0700)]
t0004: fix timing bug

The test created an initial commit, made .git/objects unwritable and then
exercised various codepaths to create loose commit, tree and blob objects
to make sure the commands notice failures from these attempts.

However, the initial commit was not preceded with test_tick, which made
its object name depend on the timestamp.  The names of all the later tree
and blob objects the test tried to create were static.  If the initial
commit's object name happened to begin with the same two hexdigits as the
tree or blob objects the test later attempted to create, the fan-out
directory in which these tree or blob would be created is already created
when the initial commit was made, and the object creation succeeds, and
commands being tested should not notice any failure --- in short, the test
was bogus.

This makes the fan-out directories also unwritable, and adds test_tick
before the commit object creation to make the test repeatable.

The contents of the file to create a blob from "a" to "60" is to force the
name of the blob object to begin with "1b", which shares the fan-out
directory with the initial commit that is created with the test.  This was
useful when diagnosing the breakage of this test.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoAdd pretty format %aN which gives the author name, respecting .mailmap
Johannes Schindelin [Fri, 11 Jul 2008 23:28:18 +0000 (00:28 +0100)]
Add pretty format %aN which gives the author name, respecting .mailmap

The pretty format %an does not respect .mailmap, but gives the exact
author name recorded in the commit.  Sometimes it is more desirable,
however, to look if the email has another name mapped to it in .mailmap.

This commit adds %aN (and %cN for the committer name) to do exactly that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoWe need to check for msys as well as Windows in add--interactive.
Mike Pape [Fri, 11 Jul 2008 16:52:42 +0000 (18:52 +0200)]
We need to check for msys as well as Windows in add--interactive.

Signed-off-by: Mike Pape <dotzenlabs@gmail.com>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoConvert CR/LF to LF in tag signatures
Johannes Schindelin [Fri, 11 Jul 2008 16:55:57 +0000 (18:55 +0200)]
Convert CR/LF to LF in tag signatures

On Windows, gpg outputs CR/LF signatures.  But since the tag messages
are already stripped of the CR by stripspace(), it is arguably nicer
to do the same for the tag signature.  Actually, this patch does not
look for CR/LF, but strips all CRs from the signature.  It does so not
only on Windows but on all platforms to keep the code simpler.

[ spr: ported code to use strbuf ]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoFixed text file auto-detection: treat EOF character 032 at the end of file as printable
Dmitry Kakurin [Fri, 11 Jul 2008 16:48:16 +0000 (18:48 +0200)]
Fixed text file auto-detection: treat EOF character 032 at the end of file as printable

Signed-off-by: Dmitry Kakurin <Dmitry.Kakurin@gmail.com>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-mailinfo: document the -n option
Lukas Sandström [Thu, 10 Jul 2008 21:36:28 +0000 (23:36 +0200)]
git-mailinfo: document the -n option

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoFix backwards-incompatible handling of core.sharedRepository
Petr Baudis [Sat, 12 Jul 2008 01:15:03 +0000 (03:15 +0200)]
Fix backwards-incompatible handling of core.sharedRepository

06cbe85 (Make core.sharedRepository more generic, 2008-04-16) broke the
traditional setting of core.sharedRepository to true, which was to make
the repository group writable: with umask 022, it would clear the
permission bits for 'other'. (umask 002 did not exhibit this behaviour
since pre-chmod() check in adjust_shared_perm() fails in that case.)

The call to adjust_shared_perm() should only loosen the permission.
If the user has umask like 022 or 002 that allow others to read, the
resulting files should be made readable and writable by group, without
restricting the readability by others.

This patch fixes the adjust_shared_perm() mode tweak based on Junio's
suggestion and adds the appropriate tests to t/t1301-shared-repo.sh.

Cc: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoTeach merge.log to "git-merge" again
Junio C Hamano [Thu, 10 Jul 2008 07:50:59 +0000 (00:50 -0700)]
Teach merge.log to "git-merge" again

The command forgot the configuration variable when rewritten in C.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agorerere: Separate libgit and builtin functions
Stephan Beyer [Wed, 9 Jul 2008 12:58:57 +0000 (14:58 +0200)]
rerere: Separate libgit and builtin functions

This patch moves rerere()-related functions into a newly created
rerere.c file.
The setup_rerere() function is needed by both rerere() and cmd_rerere(),
so this function is moved to rerere.c and declared non-static (and "extern")
in newly created rerere.h file.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobuiltin-rerere: more carefully find conflict markers
Olivier Marin [Mon, 7 Jul 2008 12:42:48 +0000 (14:42 +0200)]
builtin-rerere: more carefully find conflict markers

When a conflicting file contains a line that begin with "=======", rerere
failed to parse conflict markers. This result to a wrong preimage file and
an unexpected error for the user.  The boundary between ours and theirs
not just begin with 7 equals, but is followed by either a SP or a LF.

This patch enforces parsing rules so that markers match in the right order,
and when ambiguous, the command does not autoresolve the conflicted file.

Especially because we are introducing rerere.autoupdate configuration
(which is off by default for safety) that automatically stages the
resolution made by rerere, it is necessary to make sure that we do not
autoresolve when there is any ambiguity.

Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoapply: fix copy/rename breakage
Junio C Hamano [Thu, 10 Jul 2008 02:58:23 +0000 (19:58 -0700)]
apply: fix copy/rename breakage

7ebd52a (Merge branch 'dz/apply-again', 2008-07-01) taught "git-apply" to
grok a (non-git) patch that is a concatenation of separate patches that
touch the same file number of times, by recording the postimage of patch
application of previous round and using it as the preimage for later
rounds.

This "incremental" mode of patch application fundamentally contradicts
with the way git rename/copy patches are designed.  When a git patch talks
about a file A getting modified, and a new file B created out of A, like
this:

diff --git a/A b/A
--- a/A
+++ b/A
... change text here ...
diff --git a/A b/B
copy from A
copy to B
--- a/A
+++ b/B
... change text here ...

the second change to produce B does not depend on what is done to A with
the first change in any way.  This is explicitly done so for reviewability
of individual patches.

With this commit, we do not look at 'fn_table' that records the postimage
of previous round when applying a patch to produce a new file out of an
existing file.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'jk/pager-config'
Junio C Hamano [Wed, 9 Jul 2008 23:58:46 +0000 (16:58 -0700)]
Merge branch 'jk/pager-config'

* jk/pager-config:
  Allow per-command pager config

16 years agoMerge branch 'js/apply-root'
Junio C Hamano [Wed, 9 Jul 2008 23:58:21 +0000 (16:58 -0700)]
Merge branch 'js/apply-root'

* js/apply-root:
  git-apply --directory: make --root more similar to GNU diff
  apply --root: thinkofix.
  Teach "git apply" to prepend a prefix with "--root=<root>"

16 years agoMerge branch 'jc/reflog-expire'
Junio C Hamano [Wed, 9 Jul 2008 23:57:35 +0000 (16:57 -0700)]
Merge branch 'jc/reflog-expire'

* jc/reflog-expire:
  Make default expiration period of reflog used for stash infinite
  Per-ref reflog expiry configuration

16 years agogit-send-email: Fix authenticating on some servers when using TLS.
Robert Shearman [Wed, 9 Jul 2008 21:39:40 +0000 (22:39 +0100)]
git-send-email: Fix authenticating on some servers when using TLS.

Send HELO again after a successful STARTTLS command to refresh the list of
extensions. These may be different to what is returned over a clear
connection (for example the AUTH command may be accepted over a secure
connection, but not over a clear connection).

Furthermore, this behaviour is recommended by RFC 2487
(http://www.ietf.org/rfc/rfc2487.txt).

Signed-off-by: Robert Shearman <robertshearman@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agorevisions: refactor handle_revision_opt into parse_revision_opt.
Pierre Habouzit [Wed, 9 Jul 2008 21:38:34 +0000 (23:38 +0200)]
revisions: refactor handle_revision_opt into parse_revision_opt.

It seems we're using handle_revision_opt the same way each time, have a
wrapper around it that does the 9-liner we copy each time instead.

handle_revision_opt can be static in the module for now, it's always
possible to make it public again if needed.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-shortlog: migrate to parse-options partially.
Pierre Habouzit [Wed, 9 Jul 2008 21:38:33 +0000 (23:38 +0200)]
git-shortlog: migrate to parse-options partially.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agogit-blame: fix lapsus
Pierre Habouzit [Wed, 9 Jul 2008 20:47:38 +0000 (22:47 +0200)]
git-blame: fix lapsus

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoProvide fallback definitions of PRIu32 and PRIx32
Johannes Sixt [Wed, 9 Jul 2008 20:38:14 +0000 (22:38 +0200)]
Provide fallback definitions of PRIu32 and PRIx32

Since 6e1c23442 we make use of these C99 constructs, but this commit did
not provide fallbacks for non-C99 systems.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot9100-git-svn-basic.sh: Fix determination of utf-8 locale
Ramsay Jones [Tue, 8 Jul 2008 22:59:25 +0000 (23:59 +0100)]
t9100-git-svn-basic.sh: Fix determination of utf-8 locale

When setting the GIT_SVN_LC_ALL variable, default to the $LANG
environment variable, when the $LC_ALL override is not set.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot9113-*.sh: provide user feedback when test skipped
Ramsay Jones [Tue, 8 Jul 2008 23:18:26 +0000 (00:18 +0100)]
t9113-*.sh: provide user feedback when test skipped

Currently this test simply exits without providing any
feedback at all.  Tell user if the test is being skipped
and provide a hint as to how the test may be enabled.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'sp/maint-pack-memuse'
Junio C Hamano [Wed, 9 Jul 2008 21:46:46 +0000 (14:46 -0700)]
Merge branch 'sp/maint-pack-memuse'

* sp/maint-pack-memuse:
  Correct pack memory leak causing git gc to try to exceed ulimit

Conflicts:

sha1_file.c

16 years agoCorrect pack memory leak causing git gc to try to exceed ulimit
Shawn O. Pearce [Wed, 9 Jul 2008 07:10:07 +0000 (07:10 +0000)]
Correct pack memory leak causing git gc to try to exceed ulimit

When recursing to unpack a delta base we must unuse_pack() so that
the pack window for the current object does not remain pinned in
memory while the delta base is itself being unpacked and materialized
for our use.

On a long delta chain of 50 objects we may need to access 6 different
windows from a very large (>3G) pack file in order to obtain all
of the delta base content.  If the process ulimit permits us to
map/allocate only 1.5G we must release windows during this recursion
to ensure we stay within the ulimit and transition memory from pack
cache to standard malloc, or other mmap needs.

Inserting an unuse_pack() call prior to the recursion allows us to
avoid pinning the current window, making it available for garbage
collection if memory runs low.

This has been broken since at least before 1.5.1-rc1, and very
likely earlier than that.  Its fixed now.  :)

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobranch --merged/--no-merged: allow specifying arbitrary commit
Junio C Hamano [Wed, 9 Jul 2008 00:55:47 +0000 (17:55 -0700)]
branch --merged/--no-merged: allow specifying arbitrary commit

"git-branch --merged" is a handy way to list all the branches that have
already been merged to the current branch, but it did not allow checking
against anything but the current branch.  Having to switch branches only
to list the branches that are merged with another branch made the feature
practically useless.

This updates the option parser so that "git branch --merged next" is
accepted when you are on 'master' branch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agobranch --contains: default to HEAD
Junio C Hamano [Wed, 9 Jul 2008 00:31:51 +0000 (17:31 -0700)]
branch --contains: default to HEAD

We used to require the name of the commit to limit the branches shown to
the --contains option, but more recent --merged/--no-meregd defaults to
HEAD (and they do not allow arbitrary commit, which is a separate issue).

This teaches --contains to default to HEAD when no parameter is given.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoparse-options: add PARSE_OPT_LASTARG_DEFAULT flag
Pierre Habouzit [Tue, 8 Jul 2008 10:34:08 +0000 (12:34 +0200)]
parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

If you set this for a given option, and the optoin appears without an
argument on the command line, then the `defval' is used as its argument.

Note that this flag is meaningless in presence of OPTARG or NOARG flags.
(in the current implementation it will be ignored, but don't rely on it).

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoMerge branch 'maint'
Junio C Hamano [Wed, 9 Jul 2008 07:19:50 +0000 (00:19 -0700)]
Merge branch 'maint'

* maint:
  Start preparing release notes for 1.5.6.3
  git-submodule - Fix bugs in adding an existing repo as a module
  bash: offer only paths after '--'
  Remove unnecessary pack-*.keep file after successful git-clone
  make deleting a missing ref more quiet

16 years agoStart preparing release notes for 1.5.6.3
Junio C Hamano [Wed, 9 Jul 2008 06:57:14 +0000 (23:57 -0700)]
Start preparing release notes for 1.5.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoDocumentation: update sections on naming revisions and revision ranges
Junio C Hamano [Mon, 7 Jul 2008 21:58:58 +0000 (14:58 -0700)]
Documentation: update sections on naming revisions and revision ranges

Various *_HEAD pseudo refs were not documented in any central place.
Especially since we may be teaching rebase and am to record ORIG_HEAD,
it would be a good time to do so.

While at it, reword the explanation on r1..r2 notation to reduce
confusion.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoTone down warning about GNU Interactive Tools
Junio C Hamano [Mon, 7 Jul 2008 02:10:00 +0000 (19:10 -0700)]
Tone down warning about GNU Interactive Tools

The mention of 1997 was correct when it was made, and it still is true
to some extent (http://savannah.gnu.org/forum/forum.php?forum_id=5189
says it has not been actively maintained for quite some time).  However,
because its name changed not to conflict with us, it is no longer
relevant whether many users use gnuit or have moved away to graphical
file managers.

The only people possibly affected are people who have older version of
gnuit installed as "git".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoAvoid apache complaining about lack of server's FQDN
Mike Hommey [Mon, 7 Jul 2008 20:22:15 +0000 (22:22 +0200)]
Avoid apache complaining about lack of server's FQDN

On some setups, apache will say:
apache2: Could not reliably determine the server's fully qualified
domain name, using $(IP_address) for ServerName

Avoid this message polluting tests output by setting a ServerName in
apache configuration.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoSkip t5540-http-push test when USE_CURL_MULTI is undefined
Mike Hommey [Mon, 7 Jul 2008 19:02:50 +0000 (21:02 +0200)]
Skip t5540-http-push test when USE_CURL_MULTI is undefined

When USE_CURL_MULTI is undefined, git http-push doesn't work, so it's
useless to test it.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoFix http-push test
Mike Hommey [Mon, 7 Jul 2008 19:02:37 +0000 (21:02 +0200)]
Fix http-push test

http-push test has been broken by 4a7aaccd adding a space character
in the place where the test is being run.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoCatch failures from t5540-http-push
Mike Hommey [Mon, 7 Jul 2008 21:06:46 +0000 (23:06 +0200)]
Catch failures from t5540-http-push

git http-push doesn't handle packed-refs, and now the new builtin-clone
created packed refs, the http-push test fails.

Mark the current failure as such, and also catch third test's failure
that went unreported because git push doesn't return an error code when
it says:
 No refs in common and none specified; doing nothing.
Which it does when http-push can't get a list of refs recursively from
$URL/refs/.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agoGit.pm: Add remote_refs() git-ls-remote frontend
Petr Baudis [Tue, 8 Jul 2008 17:48:04 +0000 (19:48 +0200)]
Git.pm: Add remote_refs() git-ls-remote frontend

This patch also converts the good ole' git-remote.perl to use it.
It is otherwise used in the repo.or.cz machinery and I guess other
scripts might find it useful too.

Unfortunately,

git-ls-remote --heads .

is subtly different from

git-ls-remote . refs/heads/

(since the second matches anywhere in the string, not just at the
beginning) so we have to provide interface for both.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agot7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects
Brandon Casey [Sun, 29 Jun 2008 00:25:05 +0000 (19:25 -0500)]
t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects

Unpacked objects should receive the timestamp of the pack they were
unpacked from. Check.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years agocompletion: add branch options --contains --merged --no-merged
Eric Raible [Mon, 7 Jul 2008 20:41:54 +0000 (13:41 -0700)]
completion: add branch options --contains --merged --no-merged

Signed-off-by: Eric Raible <raible@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>