Being in the project's top directory when starting or continuing a rebase
is not necessary since 533b7039 (Allow whole-tree operations to be started
from a subdirectory, 2007-01-12).
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Pressing TAB right after 'git command --long-option=' results in
'git command --long-option=--long-option=' when the long option requires
an argument, but we don't provide completion for its arguments (e.g.
commit --author=, apply --exclude=).  This patch detects these long
options and provides empty completion array for them.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Add the following long options to be completed with command "git":

	--paginate
	--work-tree=
	--help
Signed-off-by: NTeemu Likonen <tlikonen@iki.fi>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

When doing completion of rebase options in a subdirectory of the work
tree during an ongoing rebase, wrong options were offered because of the
hardcoded .git/.dotest-merge path.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

This option is no longer recognized by git.  Completing it is
not worthwhile.
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Namely 'save', 'drop', 'pop' and 'create'
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

This patch adds the __git_find_subcommand function, which takes one
argument: a string containing all subcommands separated by spaces.  The
function searches through the command line whether a subcommand is
already present.  The first found subcommand will be printed to standard
output.

This enables us to remove code duplications from completion functions
for commands having subcommands.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Checking emptyness of $command is sufficient.
Signed-off-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NKevin Ballard <kevin@sb.org>
Signed-off-by: NShawn O. Pearce <spearce@spearce.org>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* ph/parseopt:
  parse-options: new option type to treat an option-like parameter as an argument.
  parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt

* dp/clean-fix:
  git-clean: add tests for relative path
  git-clean: correct printing relative path
  Make private quote_path() in wt-status.c available as quote_path_relative()
  Revert part of d089ebaa (setup: sanitize absolute and funny paths in get_pathspec())
  Revert part of 1abf0950 (git-add: adjust to the get_pathspec() changes)
  Revert part of 744dacd3 (builtin-mv: minimum fix to avoid losing files)
  get_pathspec(): die when an out-of-tree path is given

* ml/submodule-add-existing:
  git-submodule - Allow adding a submodule in-place

* mr/compat-snprintf:
  Add compat/snprintf.c for systems that return bogus

* sp/fetch-optim:
  Teach git-fetch to exploit server side automatic tag following
  Teach fetch-pack/upload-pack about --include-tag
  git-pack-objects: Automatically pack annotated tags if object was packed
  Teach git-fetch to grab a tag at the same time as a commit
  Make git-fetch follow tags we already have objects for sooner
  Teach upload-pack to log the received need lines to an fd
  Free the path_lists used to find non-local tags in git-fetch
  Allow builtin-fetch's find_non_local_tags to append onto a list
  Ensure tail pointer gets setup correctly when we fetch HEAD only
  Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
  Remove unused variable in builtin-fetch find_non_local_tags

* jc/describe-always:
  describe --always: fall back to showing an abbreviated object name

* jc/am:
  am: --rebasing
  am: remove support for -d .dotest
  am: read from the right mailbox when started from a subdirectory

* cr/reset-parseopt:
  Make builtin-reset.c use parse_options.

* jn/gitweb-pickaxe:
  gitweb: Fix and simplify pickaxe search

* kb/maint-filter-branch-disappear:
  filter-branch: handle "disappearing tree" case correctly in subdir filter

* maint:
  GIT 1.5.4.4
  ident.c: reword error message when the user name cannot be determined
  Fix dcommit, rebase when rewriteRoot is in use
  Really make the LF after reset in fast-import optional

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The "config --global" suggested in the message is a valid one-shot fix,
and hopefully one-shot across machines that NFS mounts the home directories.

This knowledge can hopefully be reused when you are forced to use git on
Windows, but the fix based on GECOS would not be applicable, so
it is not such a useful hint to mention the exact reason why the
name cannot be determined.
Signed-off-by: NSanti Béjar <sbejar@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

When the rewriteRoot setting is used with git-svn, it causes the svn
IDs added to commit messages to bear a different URL than is actually
used to retrieve Subversion data.

It is common for Subversion repositories to be available multiple
ways: for instance, HTTP to the public, and svn+ssh to people with
commit access.  The need to switch URLs for access is fairly common as
well -- perhaps someone was just given commit access.  To switch URLs
without having to rewrite history, one can use the old url as a
rewriteRoot, and use the new one in the svn-remote url setting.

This works well for svn fetching and general git commands.

However, git-svn dcommit, rebase, and perhaps other commands do not
work in this scenario.  They scan the svn ID lines in commit messages
and attempt to match them up with url lines in [svn-remote] sections
in the git config.

This patch allows them to match rewriteRoot options, if such options
are present.
Signed-off-by: NJohn Goerzen <jgoerzen@complete.org>
Acked-by: NEric Wong <normalperson@yhbt.net>

The subdirectory filter had a bug to notice that the commit in question
did not have anything in the path-limited part of the tree.  $commit:$path
does not name an empty tree when $path does not appear in $commit.

This should fix it.  The additional test in t7003 is originally from Kevin
Ballard but with fixups.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The configuration variables for custom merge tools were documented
only in config.txt but there was no reference to the functionality in
git-mergetool.txt.
Signed-off-by: NCharles Bailey <charles@hashpling.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCharles Bailey <charles@hashpling.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

cmd_from() ends with a call to read_next_command(), which is needed
when using cmd_from() from commands where from is not the last element.

With reset, however, "from" is the last command, after which the flow
returns to the main loop, which calls read_next_command() again.

Because of this, always set unread_command_buf in cmd_reset_branch(),
even if cmd_from() was successful.

Add a test case for this in t9300-fast-import.sh.
Signed-off-by: NAdeodato Simó <dato@net.com.org.es>
Acked-by: NShawn O. Pearce <spearce@spearce.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* aw/maint-shortlog-blank-lines:
  shortlog: take the first populated line of the description

* mh/maint-http-proxy-fix:
  Set proxy override with http_init()

* js/maint-daemon:
  daemon: ensure that base-path is an existing directory
  daemon: send more error messages to the syslog

* js/maint-cvsexport:
  cvsexportcommit: be graceful when "cvs status" reorders the arguments

Conflicts:

	t/t9200-git-cvsexportcommit.sh

* jc/maint-log-merge-left-right:
  Fix "git log --merge --left-right"

* ew/maint-svn-cert-fileprovider:
  git-svn: Don't prompt for client cert password everytime.

* maint:
  unquote_c_style: fix off-by-one.
  test-lib: fix TERM to dumb for test repeatability
  config.txt: refer to --upload-pack and --receive-pack instead of --exec
  git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails

The logic to countermand suppression of Cc to the signers with a more
explicit --signed-off-by option done in 65648283 (git-send-email:
Generalize auto-cc recipient mechanism) suffers from a double-negation
error.

A --signed-off-cc option, when false, should actively suppress CC: to be
generated out of S-o-b lines, and it should refrain from suppressing when
it is true.

It also fixes "(sob) Adding cc:" status output; earlier it included the
line terminator LF inside '%s', which was totally bogus.
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* js/reflog-delete:
  t3903-stash.sh: Add tests for new stash commands drop and pop
  git-reflog.txt: Document new commands --updateref and --rewrite
  t3903-stash.sh: Add missing '&&' to body of testcase
  git-stash: add new 'pop' subcommand
  git-stash: add new 'drop' subcommand
  git-reflog: add option --updateref to write the last reflog sha1 into the ref
  refs.c: make close_ref() and commit_ref() non-static
  git-reflog: add option --rewrite to update reflog entries while expiring
  reflog-delete: parse standard reflog options
  builtin-reflog.c: fix typo that accesses an unset variable
  Teach "git reflog" a subcommand to delete single entries

* dc/format-pretty:
  log/show/whatchanged: introduce format.pretty configuration
  specify explicit "--pretty=medium" with `git log/show/whatchanged`
  whatchanged documentation: share description of --pretty with others

* cb/mergetool:
  Add a very basic test script for git mergetool
  Teach git mergetool to use custom commands defined at config time
  Changed an internal variable of mergetool to support custom commands
  Tidy up git mergetool's backup file behaviour