git/git.git
8 years agoMerge branch 'kb/maint-bundle-doc'
Junio C Hamano [Tue, 8 Jan 2013 21:23:26 +0000 (13:23 -0800)]
Merge branch 'kb/maint-bundle-doc'

* kb/maint-bundle-doc:
  Documentation: full-ness of a bundle is significant for cloning
  Documentation: correct example restore from bundle

8 years agoMerge branch 'as/test-name-alias-uniquely'
Junio C Hamano [Tue, 8 Jan 2013 21:23:21 +0000 (13:23 -0800)]
Merge branch 'as/test-name-alias-uniquely'

A few short-and-bland aliases used in the tests were interfering
with git-custom command in user's $PATH.

* as/test-name-alias-uniquely:
  Use longer alias names in subdirectory tests

8 years agoMerge branch 'ta/remove-stale-translated-tut'
Junio C Hamano [Tue, 8 Jan 2013 21:23:10 +0000 (13:23 -0800)]
Merge branch 'ta/remove-stale-translated-tut'

Remove a translation of a document that was left stale.

* ta/remove-stale-translated-tut:
  Remove Documentation/pt_BR/gittutorial.txt

8 years agoMerge branch 'tb/test-t9810-no-sed-i'
Junio C Hamano [Tue, 8 Jan 2013 21:23:05 +0000 (13:23 -0800)]
Merge branch 'tb/test-t9810-no-sed-i'

* tb/test-t9810-no-sed-i:
  t9810: Do not use sed -i

8 years agoMerge branch 'tb/test-t9020-no-which'
Junio C Hamano [Tue, 8 Jan 2013 21:23:00 +0000 (13:23 -0800)]
Merge branch 'tb/test-t9020-no-which'

* tb/test-t9020-no-which:
  t9020: which is not portable

8 years agoMerge branch 'jk/maint-fast-import-doc-dedup-done'
Junio C Hamano [Tue, 8 Jan 2013 21:22:52 +0000 (13:22 -0800)]
Merge branch 'jk/maint-fast-import-doc-dedup-done'

The "logical order" reorganization can come after that is done and
can cook longer in 'next'.

* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option

8 years agoMerge branch 'jk/pathspec-literal'
Junio C Hamano [Tue, 8 Jan 2013 21:22:32 +0000 (13:22 -0800)]
Merge branch 'jk/pathspec-literal'

Finishing touches to fix a test breakage on Windows

* jk/pathspec-literal:
  t6130-pathspec-noglob: Windows does not allow a file named "f*"

8 years agoMerge branch 'jk/maint-fast-import-doc-dedup-done'
Junio C Hamano [Tue, 8 Jan 2013 21:21:07 +0000 (13:21 -0800)]
Merge branch 'jk/maint-fast-import-doc-dedup-done'

* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option

8 years agogit-fast-import(1): remove duplicate '--done' option
John Keeping [Mon, 7 Jan 2013 11:57:09 +0000 (11:57 +0000)]
git-fast-import(1): remove duplicate '--done' option

The '--done' option to git-fast-import is documented twice in its manual
page.  Combine the best bits of each description, keeping the location
of the instance that was added first.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'mz/oneway-merge-wo-u-no-lstat'
Junio C Hamano [Mon, 7 Jan 2013 06:11:39 +0000 (22:11 -0800)]
Merge branch 'mz/oneway-merge-wo-u-no-lstat'

Optimize "read-tree -m <tree-ish>" without "-u".

* mz/oneway-merge-wo-u-no-lstat:
  oneway_merge(): only lstat() when told to update worktree

8 years agoMerge branch 'cc/no-gitk-build-dependency'
Junio C Hamano [Mon, 7 Jan 2013 06:11:30 +0000 (22:11 -0800)]
Merge branch 'cc/no-gitk-build-dependency'

Remove leftover bits from an earlier change to move gitk in its own
subdirectory.  Reimplementing the dependency tracking rules needs
to be done in gitk history separately.

* cc/no-gitk-build-dependency:
  Makefile: replace "echo 1>..." with "echo >..."
  Makefile: detect when PYTHON_PATH changes
  Makefile: remove tracking of TCLTK_PATH

8 years agoMerge branch 'jn/warn-on-inaccessible-loosen'
Junio C Hamano [Mon, 7 Jan 2013 06:11:16 +0000 (22:11 -0800)]
Merge branch 'jn/warn-on-inaccessible-loosen'

Deal with a situation where .config/git is a file and we notice
.config/git/config is not readable due to ENOTDIR, not ENOENT.

* jn/warn-on-inaccessible-loosen:
  config: exit on error accessing any config file
  doc: advertise GIT_CONFIG_NOSYSTEM
  config: treat user and xdg config permission problems as errors
  config, gitignore: failure to access with ENOTDIR is ok

8 years agoMerge branch 'jc/apply-trailing-blank-removal'
Junio C Hamano [Mon, 7 Jan 2013 06:10:23 +0000 (22:10 -0800)]
Merge branch 'jc/apply-trailing-blank-removal'

Fix to update_pre_post_images() that did not take into account the
possibility that whitespace fix could shrink the preimage and
change the number of lines in it.

* jc/apply-trailing-blank-removal:
  apply.c:update_pre_post_images(): the preimage can be truncated

8 years agot6130-pathspec-noglob: Windows does not allow a file named "f*"
Johannes Sixt [Sun, 6 Jan 2013 14:07:43 +0000 (15:07 +0100)]
t6130-pathspec-noglob: Windows does not allow a file named "f*"

Windows disallows file names that contain a star. Arrange the test setup
to insert the file name "f*" in the repository without the corresponding
file in the worktree.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes to 1.8.2
Junio C Hamano [Sun, 6 Jan 2013 08:17:24 +0000 (00:17 -0800)]
Update draft release notes to 1.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'wk/submodule-update-remote'
Junio C Hamano [Sun, 6 Jan 2013 07:42:11 +0000 (23:42 -0800)]
Merge branch 'wk/submodule-update-remote'

The beginning of 'integrate with the tip of the remote branch, not
the commit recorded in the superproject gitlink' support.

* wk/submodule-update-remote:
  submodule add: If --branch is given, record it in .gitmodules
  submodule update: add --remote for submodule's upstream changes
  submodule: add get_submodule_config helper funtion

8 years agoMerge branch 'jk/pathspec-literal'
Junio C Hamano [Sun, 6 Jan 2013 07:42:07 +0000 (23:42 -0800)]
Merge branch 'jk/pathspec-literal'

Allow scripts to feed literal paths to commands that take
pathspecs, by disabling wildcard globbing.

* jk/pathspec-literal:
  add global --literal-pathspecs option

Conflicts:
dir.c

8 years agoMerge branch 'jk/error-const-return'
Junio C Hamano [Sun, 6 Jan 2013 07:42:00 +0000 (23:42 -0800)]
Merge branch 'jk/error-const-return'

Help compilers' flow analysis by making it more explicit that
error() always returns -1, to reduce false "variable used
uninitialized" warnings.  Looks somewhat ugly but not too much.

* jk/error-const-return:
  silence some -Wuninitialized false positives
  make error()'s constant return value more visible

8 years agoMerge branch 'jc/format-color-auto'
Junio C Hamano [Sun, 6 Jan 2013 07:41:57 +0000 (23:41 -0800)]
Merge branch 'jc/format-color-auto'

Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
not color its output when writing to a non-terminal.

* jc/format-color-auto:
  log --format: teach %C(auto,black) to respect color config
  t6006: clean up whitespace

8 years agoMerge branch 'jk/complete-commit-c'
Junio C Hamano [Sun, 6 Jan 2013 07:41:53 +0000 (23:41 -0800)]
Merge branch 'jk/complete-commit-c'

Complete "git commmit -c foo<TAB>" into a refname that begins with
"foo".

* jk/complete-commit-c:
  completion: complete refs for "git commit -c"

8 years agoMerge branch 'ja/directory-attrs'
Junio C Hamano [Sun, 6 Jan 2013 07:41:46 +0000 (23:41 -0800)]
Merge branch 'ja/directory-attrs'

The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
exclude mechanism does.

* ja/directory-attrs:
  Add directory pattern matching to attributes

8 years agoMerge branch 'jk/mailmap-from-blob'
Junio C Hamano [Sun, 6 Jan 2013 07:41:42 +0000 (23:41 -0800)]
Merge branch 'jk/mailmap-from-blob'

Allow us to read, and default to read, mailmap files from the tip
of the history in bare repositories.  This will help running tools
like shortlog in server settings.

* jk/mailmap-from-blob:
  mailmap: default mailmap.blob in bare repositories
  mailmap: fix some documentation loose-ends for mailmap.blob
  mailmap: clean up read_mailmap error handling
  mailmap: support reading mailmap from blobs
  mailmap: refactor mailmap parsing for non-file sources

8 years agoMerge branch 'jc/fetch-ignore-symref'
Junio C Hamano [Sun, 6 Jan 2013 07:41:37 +0000 (23:41 -0800)]
Merge branch 'jc/fetch-ignore-symref'

Avoid false error from an attempt to update local symbolic ref via
fetch.

* jc/fetch-ignore-symref:
  fetch: ignore wildcarded refspecs that update local symbolic refs

8 years agoMerge branch 'cr/push-force-tag-update'
Junio C Hamano [Sun, 6 Jan 2013 07:41:34 +0000 (23:41 -0800)]
Merge branch 'cr/push-force-tag-update'

Require "-f" for push to update a tag, even if it is a fast-forward.

* cr/push-force-tag-update:
  push: allow already-exists advice to be disabled
  push: rename config variable for more general use
  push: cleanup push rules comment
  push: clarify rejection of update to non-commit-ish
  push: require force for annotated tags
  push: require force for refs under refs/tags/
  push: flag updates that require force
  push: keep track of "update" state separately
  push: add advice for rejected tag reference
  push: return reject reasons as a bitset

8 years agoMerge branch 'fc/fast-export-fixes'
Junio C Hamano [Sun, 6 Jan 2013 07:41:09 +0000 (23:41 -0800)]
Merge branch 'fc/fast-export-fixes'

Various updates to fast-export used in the context of the remote
helper interface.

* fc/fast-export-fixes:
  fast-export: make sure updated refs get updated
  fast-export: don't handle uninteresting refs
  fast-export: fix comparison in tests
  fast-export: trivial cleanup
  remote-testgit: implement the "done" feature manually
  remote-testgit: report success after an import
  remote-testgit: exercise more features
  remote-testgit: cleanup tests
  remote-testgit: remove irrelevant test
  remote-testgit: remove non-local functionality
  Add new simplified git-remote-testgit
  Rename git-remote-testgit to git-remote-testpy
  remote-helpers: fix failure message
  remote-testgit: fix direction of marks
  fast-export: avoid importing blob marks

8 years agoMerge branch 'mh/unify-xml-in-imap-send-and-http-push'
Junio C Hamano [Sun, 6 Jan 2013 07:41:04 +0000 (23:41 -0800)]
Merge branch 'mh/unify-xml-in-imap-send-and-http-push'

Update imap-send to reuse xml quoting code from http-push codepath,
clean up some code, and fix a small bug.

* mh/unify-xml-in-imap-send-and-http-push:
  wrap_in_html(): process message in bulk rather than line-by-line
  wrap_in_html(): use strbuf_addstr_xml_quoted()
  imap-send: change msg_data from storing (ptr, len) to storing strbuf
  imap-send: correctly report errors reading from stdin
  imap-send: store all_msgs as a strbuf
  lf_to_crlf(): NUL-terminate msg_data::data
  xml_entities(): use function strbuf_addstr_xml_quoted()
  Add new function strbuf_add_xml_quoted()

8 years agoMerge branch 'nd/pathspec-wildcard'
Junio C Hamano [Sun, 6 Jan 2013 07:40:15 +0000 (23:40 -0800)]
Merge branch 'nd/pathspec-wildcard'

Optimize matching paths with common forms of pathspecs that contain
wildcard characters.

* nd/pathspec-wildcard:
  tree_entry_interesting: do basedir compare on wildcard patterns when possible
  pathspec: apply "*.c" optimization from exclude
  pathspec: do exact comparison on the leading non-wildcard part
  pathspec: save the non-wildcard length part

8 years agoMerge branch 'jk/fsck-dot-in-trees'
Junio C Hamano [Sun, 6 Jan 2013 07:40:04 +0000 (23:40 -0800)]
Merge branch 'jk/fsck-dot-in-trees'

* jk/fsck-dot-in-trees:
  fsck: warn about ".git" in trees
  fsck: warn about '.' and '..' in trees

8 years agoMerge branch 'pf/editor-ignore-sigint'
Junio C Hamano [Sun, 6 Jan 2013 06:48:09 +0000 (22:48 -0800)]
Merge branch 'pf/editor-ignore-sigint'

* pf/editor-ignore-sigint:
  fix compilation with NO_PTHREADS

8 years agofix compilation with NO_PTHREADS
Jeff King [Sat, 5 Jan 2013 14:52:29 +0000 (09:52 -0500)]
fix compilation with NO_PTHREADS

Commit 1327452 cleaned up an unused parameter from
wait_or_whine, but forgot to update a caller that is inside
"#ifdef NO_PTHREADS".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUpdate draft release notes to 1.8.2
Junio C Hamano [Thu, 3 Jan 2013 18:33:22 +0000 (10:33 -0800)]
Update draft release notes to 1.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'da/p4merge-mktemp'
Junio C Hamano [Thu, 3 Jan 2013 18:29:32 +0000 (10:29 -0800)]
Merge branch 'da/p4merge-mktemp'

Create an empty file in $TMPDIR instead of using an empty file in
the local directory.

* da/p4merge-mktemp:
  mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

8 years agoMerge branch 'ms/subtree-fixlets'
Junio C Hamano [Thu, 3 Jan 2013 18:29:29 +0000 (10:29 -0800)]
Merge branch 'ms/subtree-fixlets'

* ms/subtree-fixlets:
  git-subtree: fix typo in manpage
  git-subtree: ignore git-subtree executable

8 years agoMerge branch 'as/test-tweaks'
Junio C Hamano [Thu, 3 Jan 2013 18:29:12 +0000 (10:29 -0800)]
Merge branch 'as/test-tweaks'

Output from the tests is coloured using "green is okay, yellow is
questionable, red is bad and blue is informative" scheme.

* as/test-tweaks:
  tests: paint unexpectedly fixed known breakages in bold red
  tests: test the test framework more thoroughly
  tests: refactor mechanics of testing in a sub test-lib
  tests: change info messages from yellow/brown to cyan
  tests: paint skipped tests in blue
  tests: paint known breakages in yellow
  tests: test number comes first in 'not ok $count - $message'

8 years agoMerge branch 'jc/same-encoding'
Junio C Hamano [Thu, 3 Jan 2013 18:29:08 +0000 (10:29 -0800)]
Merge branch 'jc/same-encoding'

Finishing touches to the series to unify "Do we need to reencode
between these two encodings?" logic.

* jc/same-encoding:
  format_commit_message(): simplify calls to logmsg_reencode()

8 years agoMerge branch 'pf/editor-ignore-sigint'
Junio C Hamano [Thu, 3 Jan 2013 18:28:45 +0000 (10:28 -0800)]
Merge branch 'pf/editor-ignore-sigint'

The behaviour visible to the end users was confusing, when they
attempt to kill a process spawned in the editor that was in turn
launched by Git with SIGINT (or SIGQUIT), as Git would catch that
signal and die.  We ignore these signals now.

* pf/editor-ignore-sigint:
  launch_editor: propagate signals from editor to git
  run-command: do not warn about child death from terminal
  launch_editor: ignore terminal signals while editor has control
  launch_editor: refactor to use start/finish_command
  run-command: drop silent_exec_failure arg from wait_or_whine

8 years agoMerge branch 'mh/pthreads-autoconf'
Junio C Hamano [Thu, 3 Jan 2013 18:28:33 +0000 (10:28 -0800)]
Merge branch 'mh/pthreads-autoconf'

* mh/pthreads-autoconf:
  configure.ac: fix pthreads detection on Mac OS X

8 years agoMerge branch 'mk/qnx'
Junio C Hamano [Thu, 3 Jan 2013 18:28:26 +0000 (10:28 -0800)]
Merge branch 'mk/qnx'

Port to QNX.

* mk/qnx:
  Port to QNX
  Make lock local to fetch_pack

8 years agoMerge branch 'dm/port'
Junio C Hamano [Thu, 3 Jan 2013 18:28:21 +0000 (10:28 -0800)]
Merge branch 'dm/port'

Add a few more knobs for new platform ports can tweak.

* dm/port:
  git-compat-util.h: do not #include <sys/param.h> by default
  Generalize the inclusion of strings.h
  Detect when the passwd struct is missing pw_gecos
  Support builds when sys/param.h is missing

8 years agoMerge branch 'ss/nedmalloc-compilation'
Junio C Hamano [Thu, 3 Jan 2013 18:14:10 +0000 (10:14 -0800)]
Merge branch 'ss/nedmalloc-compilation'

* ss/nedmalloc-compilation:
  nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2

8 years agoMerge branch 'jc/maint-fnmatch-old-style-definition'
Junio C Hamano [Thu, 3 Jan 2013 18:14:05 +0000 (10:14 -0800)]
Merge branch 'jc/maint-fnmatch-old-style-definition'

Update old-style function definition "int foo(bar) int bar; {}"
to "int foo(int bar) {}".

* jc/maint-fnmatch-old-style-definition:
  compat/fnmatch: update old-style definition to ANSI

8 years agoStart 1.8.2 cycle
Junio C Hamano [Wed, 2 Jan 2013 18:44:12 +0000 (10:44 -0800)]
Start 1.8.2 cycle

Various fixes that have been cooking in 'next' have been merged. All
of them should go to 'maint' for 1.8.1.1 later.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jc/test-portability'
Junio C Hamano [Wed, 2 Jan 2013 18:53:59 +0000 (10:53 -0800)]
Merge branch 'jc/test-portability'

* jc/test-portability:
  t9020: use configured Python to run the test helper
  t3600: Avoid "cp -a", which is a GNUism

8 years agoMerge branch 'jc/maint-fbsd-sh-ifs-workaround'
Junio C Hamano [Wed, 2 Jan 2013 18:40:41 +0000 (10:40 -0800)]
Merge branch 'jc/maint-fbsd-sh-ifs-workaround'

Some shells do not behave correctly when IFS is unset; work it
around by explicitly setting it to the default value.

* jc/maint-fbsd-sh-ifs-workaround:
  sh-setup: work around "unset IFS" bug in some shells

8 years agoMerge branch 'sp/shortlog-missing-lf'
Junio C Hamano [Wed, 2 Jan 2013 18:40:34 +0000 (10:40 -0800)]
Merge branch 'sp/shortlog-missing-lf'

When a line to be wrapped has a solid run of non space characters
whose length exactly is the wrap width, "git shortlog -w" failed to
add a newline after such a line.

* sp/shortlog-missing-lf:
  strbuf_add_wrapped*(): Remove unused return value
  shortlog: fix wrapping lines of wraplen

8 years agoMerge branch 'md/gitweb-sort-by-age'
Junio C Hamano [Wed, 2 Jan 2013 18:40:03 +0000 (10:40 -0800)]
Merge branch 'md/gitweb-sort-by-age'

"gitweb", when sorting by age to show repositories with new
activities first, used to sort repositories with absolutely nothing
in it early, which was not very useful.

* md/gitweb-sort-by-age:
  gitweb: Sort projects with undefined ages last

8 years agoMerge branch 'nd/invalidate-i-t-a-cache-tree'
Junio C Hamano [Wed, 2 Jan 2013 18:39:51 +0000 (10:39 -0800)]
Merge branch 'nd/invalidate-i-t-a-cache-tree'

After "git add -N" and then writing a tree object out of the
index, the cache-tree data structure got corrupted.

* nd/invalidate-i-t-a-cache-tree:
  cache-tree: invalidate i-t-a paths after generating trees
  cache-tree: fix writing cache-tree when CE_REMOVE is present
  cache-tree: replace "for" loops in update_one with "while" loops
  cache-tree: remove dead i-t-a code in verify_cache()

8 years agoMerge branch 'jk/repack-ref-racefix'
Junio C Hamano [Wed, 2 Jan 2013 18:39:36 +0000 (10:39 -0800)]
Merge branch 'jk/repack-ref-racefix'

"git pack-refs" that ran in parallel to another process that created
new refs had a nasty race.

* jk/repack-ref-racefix:
  refs: do not use cached refs in repack_without_ref

8 years agoMerge branch 'rb/http-cert-cred-no-username-prompt'
Junio C Hamano [Wed, 2 Jan 2013 18:39:21 +0000 (10:39 -0800)]
Merge branch 'rb/http-cert-cred-no-username-prompt'

http transport was wrong to ask for the username when the
authentication is done by certificate identity.

* rb/http-cert-cred-no-username-prompt:
  http.c: Avoid username prompt for certifcate credentials

8 years agoMerge branch 'mk/maint-graph-infinity-loop'
Junio C Hamano [Wed, 2 Jan 2013 18:39:09 +0000 (10:39 -0800)]
Merge branch 'mk/maint-graph-infinity-loop'

The --graph code fell into infinite loop when asked to do what the
code did not expect.

* mk/maint-graph-infinity-loop:
  graph.c: infinite loop in git whatchanged --graph -m

8 years agoMerge branch 'ss/svn-prompt'
Junio C Hamano [Wed, 2 Jan 2013 18:38:50 +0000 (10:38 -0800)]
Merge branch 'ss/svn-prompt'

The way "git svn" asked for password using SSH_ASKPASS and
GIT_ASKPASS was not in line with the rest of the system.

* ss/svn-prompt:
  git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
  perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
  git-svn, perl/Git.pm: add central method for prompting passwords

8 years agoMerge branch 'jc/mkstemp-more-careful-error-reporting'
Junio C Hamano [Wed, 2 Jan 2013 18:38:25 +0000 (10:38 -0800)]
Merge branch 'jc/mkstemp-more-careful-error-reporting'

After failing to create a temporary file using mkstemp(), failing
pathname was not reported correctly on some platforms.

* jc/mkstemp-more-careful-error-reporting:
  xmkstemp(): avoid showing truncated template more carefully

8 years agoMerge branch 'jc/test-cvs-no-init-in-existing-dir'
Junio C Hamano [Wed, 2 Jan 2013 18:38:09 +0000 (10:38 -0800)]
Merge branch 'jc/test-cvs-no-init-in-existing-dir'

t9200 runs "cvs init" on a directory that already exists, but a
platform can configure this fail for the current user (e.g. you need
to be in the cvsadmin group on NetBSD 6.0).

* jc/test-cvs-no-init-in-existing-dir:
  t9200: let "cvs init" create the test repository

8 years agoMerge branch 'jc/maint-test-portability'
Junio C Hamano [Wed, 2 Jan 2013 18:37:48 +0000 (10:37 -0800)]
Merge branch 'jc/maint-test-portability'

t4014, t9502 and t0200 tests had various portability issues that
broke on OpenBSD.

* jc/maint-test-portability:
  t4014: fix arguments to grep
  t9502: do not assume GNU tar
  t0200: "locale" may not exist

8 years agoMerge branch 'mh/ceiling'
Junio C Hamano [Wed, 2 Jan 2013 18:36:59 +0000 (10:36 -0800)]
Merge branch 'mh/ceiling'

An element on GIT_CEILING_DIRECTORIES list that does not name the
real path to a directory (i.e. a symbolic link) could have caused
the GIT_DIR discovery logic to escape the ceiling.

* mh/ceiling:
  string_list_longest_prefix(): remove function
  setup_git_directory_gently_1(): resolve symlinks in ceiling paths
  longest_ancestor_length(): require prefix list entries to be normalized
  longest_ancestor_length(): take a string_list argument for prefixes
  longest_ancestor_length(): use string_list_split()
  Introduce new function real_path_if_valid()
  real_path_internal(): add comment explaining use of cwd
  Introduce new static function real_path_internal()

8 years agot9020: which is not portable
Torsten Bögershausen [Tue, 1 Jan 2013 21:42:03 +0000 (22:42 +0100)]
t9020: which is not portable

Use type instead

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot9810: Do not use sed -i
Torsten Bögershausen [Tue, 1 Jan 2013 21:40:37 +0000 (22:40 +0100)]
t9810: Do not use sed -i

sed -i is not portable on all systems.  Use sed with different input
and output files.  Utilize a tmp file whenever needed.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation: full-ness of a bundle is significant for cloning
Junio C Hamano [Tue, 1 Jan 2013 20:46:15 +0000 (12:46 -0800)]
Documentation: full-ness of a bundle is significant for cloning

Not necessarily every bundle file can be cloned from.  Only the ones
that do not need prerequisites can.

When 1d52b02 (Documentation: minor grammatical fixes and rewording
in git-bundle.txt, 2009-03-22) reworded this paragraph, it lost a
critical hint to tell readers why this particular bundle can be
cloned from.  Resurrect it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation: correct example restore from bundle
Kirill Brilliantov [Tue, 1 Jan 2013 13:54:44 +0000 (17:54 +0400)]
Documentation: correct example restore from bundle

Because the bundle created in the example does not record HEAD, "git
clone" will not check out the files to the working tree:

    $ git clone pr.bundle q/
    Cloning into 'q'...
    Receiving objects: 100% (619/619), 13.52 MiB | 18.74 MiB/s, done.
    Resolving deltas: 100% (413/413), done.
    warning: remote HEAD refers to nonexistent ref, unable to checkout.

Avoid alarming the readers by adding "-b master" to the example.  A
better fix may be to arrange the bundle created in the earlier step
to record HEAD, so that it can be cloned without this workaround.

Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov@inbox.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoGit 1.8.1 v1.8.1
Junio C Hamano [Mon, 31 Dec 2012 22:24:22 +0000 (14:24 -0800)]
Git 1.8.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoUse longer alias names in subdirectory tests
Aaron Schrab [Fri, 28 Dec 2012 23:03:06 +0000 (18:03 -0500)]
Use longer alias names in subdirectory tests

When testing aliases in t/t1020-subdirectory.sh use longer names so that
they're less likely to conflict with a git-* command somewhere in the
$PATH.

I have a git-ss command in my path which prevents the 'ss' alias from
being used.  This command will always fail for git.git, causing the test
to fail.  Even if the command succeeded, that would be a false success
for the test since the alias wasn't actually used.  A longer, more
descriptive name will make it much less likely that somebody has a
command in their $PATH which will shadow the alias created for the test.

While here, use a longer name for the 'test' alias as well since that is
also short and meaningful enough to make it not unlikely that somebody
would have a command in their $PATH which will shadow that as well.

Signed-off-by: Aaron Schrab <aaron@schrab.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'so/prompt-command'
Junio C Hamano [Fri, 28 Dec 2012 00:00:07 +0000 (16:00 -0800)]
Merge branch 'so/prompt-command'

Finishing touches...

* so/prompt-command:
  make __git_ps1 accept a third parameter in pcmode

8 years agoSync with 1.8.0.3
Junio C Hamano [Thu, 27 Dec 2012 23:59:42 +0000 (15:59 -0800)]
Sync with 1.8.0.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoGit 1.8.0.3 v1.8.0.3
Junio C Hamano [Thu, 27 Dec 2012 23:57:20 +0000 (15:57 -0800)]
Git 1.8.0.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit(1): show link to contributor summary page
Junio C Hamano [Wed, 12 Dec 2012 18:06:24 +0000 (10:06 -0800)]
git(1): show link to contributor summary page

We earlier removed a link to list of contributors that pointed to a
defunct page; let's use a working one from Ohloh.net to replace it
instead.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'sl/maint-git-svn-docs' into maint
Junio C Hamano [Thu, 27 Dec 2012 23:38:34 +0000 (15:38 -0800)]
Merge branch 'sl/maint-git-svn-docs' into maint

* sl/maint-git-svn-docs:
  git-svn: Note about tags.
  git-svn: Expand documentation for --follow-parent
  git-svn: Recommend use of structure options.
  git-svn: Document branches with at-sign(@).

8 years agogit-svn: Note about tags.
Sebastian Leske [Fri, 23 Nov 2012 07:29:38 +0000 (08:29 +0100)]
git-svn: Note about tags.

Document that 'git svn' will import SVN tags as branches.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-svn: Expand documentation for --follow-parent
Sebastian Leske [Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)]
git-svn: Expand documentation for --follow-parent

Describe what the option --follow-parent does, and what happens if it is
set or unset.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-svn: Recommend use of structure options.
Sebastian Leske [Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)]
git-svn: Recommend use of structure options.

Document that when using git svn, one should usually either use the
directory structure options to import branches as branches, or only
import one subdirectory. The default behaviour of cloning all branches
and tags as subdirectories in the working copy is usually not what the
user wants.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-svn: Document branches with at-sign(@).
Sebastian Leske [Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)]
git-svn: Document branches with at-sign(@).

git svn sometimes creates branches with an at-sign in the name
(branchname@revision). These branches confuse many users and it is a FAQ
why they are created. Document when git svn creates them.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'gb/maint-doc-svn-log-window-size' into maint
Junio C Hamano [Thu, 27 Dec 2012 23:34:37 +0000 (15:34 -0800)]
Merge branch 'gb/maint-doc-svn-log-window-size' into maint

* branch 'gb/maint-doc-svn-log-window-size':
  Document git-svn fetch --log-window-size parameter

8 years agoMerge branch 'km/maint-doc-git-reset' into maint
Junio C Hamano [Thu, 27 Dec 2012 23:32:27 +0000 (15:32 -0800)]
Merge branch 'km/maint-doc-git-reset' into maint

* branch 'km/maint-doc-git-reset':
  doc: git-reset: make "<mode>" optional

8 years agogit-remote-helpers.txt: document invocation before input format
Max Horn [Tue, 27 Nov 2012 23:03:21 +0000 (00:03 +0100)]
git-remote-helpers.txt: document invocation before input format

In the distant past, the order things were documented was
'Invocation', 'Commands', 'Capabilities', ...

Then it was decided that before giving a list of Commands, there
should be an overall description of the 'Input format', which was
a wise decision. However, this description was put as the very
first thing, with the rationale that any implementor would want
to know that first.

However, it seems an implementor would actually first need to
know how the remote helper will be invoked, so moving
'Invocation' to the front again seems logical. Moreover, we now
don't switch from discussing the input format to the invocation
style and then back to input related stuff.

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/avoid-mailto-invalid-in-doc' into maint
Junio C Hamano [Thu, 27 Dec 2012 23:27:46 +0000 (15:27 -0800)]
Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint

* jk/avoid-mailto-invalid-in-doc:
  Documentation: don't link to example mail addresses

8 years agoMerge branch 'tj/maint-doc-commit-sign' into maint
Junio C Hamano [Thu, 27 Dec 2012 23:24:51 +0000 (15:24 -0800)]
Merge branch 'tj/maint-doc-commit-sign' into maint

* branch 'tj/maint-doc-commit-sign':
  Add -S, --gpg-sign option to manpage of "git commit"

8 years agoDocumentation: move diff.wordRegex from config.txt to diff-config.txt
Ramkumar Ramachandra [Tue, 13 Nov 2012 15:42:44 +0000 (21:12 +0530)]
Documentation: move diff.wordRegex from config.txt to diff-config.txt

19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoRemove Documentation/pt_BR/gittutorial.txt
Thomas Ackermann [Thu, 27 Dec 2012 14:15:52 +0000 (15:15 +0100)]
Remove Documentation/pt_BR/gittutorial.txt

This file is rather outdated and IMHO shouldn't be there in the first place.
(If there are translations of the Git documentation they are better be kept
separate from the original documentation.)

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agomergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
David Aguilar [Thu, 27 Dec 2012 00:45:29 +0000 (16:45 -0800)]
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

Use $TMPDIR when creating the /dev/null placeholder for p4merge.
This prevents users from finding a seemingly random untracked file
in their worktree.

This is different than what mergetool does with $LOCAL and
$REMOTE because those files exist to aid users when resolving
merges.  p4merge's /dev/null placeholder is not helpful in that
situation so it is sensible to keep it out of the worktree.

Reported-by: Jeremy Morton <admin@game-point.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agomake __git_ps1 accept a third parameter in pcmode
Simon Oosthoek [Wed, 26 Dec 2012 19:15:05 +0000 (20:15 +0100)]
make __git_ps1 accept a third parameter in pcmode

The optional third parameter when __git_ps1 is used in
PROMPT_COMMAND mode as format string for printf to further
customize the way the git status string is embedded in the
user's PS1 prompt.

Signed-off-by: Simon Oosthoek <s.oosthoek@xs4all.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot9200: let "cvs init" create the test repository
Junio C Hamano [Tue, 25 Dec 2012 01:09:49 +0000 (17:09 -0800)]
t9200: let "cvs init" create the test repository

Some platforms (e.g. NetBSD 6.0) seem to configure their CVS to
allow "cvs init" in an existing directory only to members of
"cvsadmin".

Instead of preparing an empty directory and then running "cvs init"
on it, let's run "cvs init" and let it create the necessary
directory.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'maint'
Junio C Hamano [Sun, 23 Dec 2012 04:40:07 +0000 (20:40 -0800)]
Merge branch 'maint'

8 years agoMerge branch 'jc/doc-diff-blobs' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:38:07 +0000 (20:38 -0800)]
Merge branch 'jc/doc-diff-blobs' into maint

* jc/doc-diff-blobs:
  Documentation: Describe "git diff <blob> <blob>" separately

8 years agoMerge branch 'cr/doc-checkout-branch' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:38:02 +0000 (20:38 -0800)]
Merge branch 'cr/doc-checkout-branch' into maint

* cr/doc-checkout-branch:
  Documentation/git-checkout.txt: document 70c9ac2 behavior
  Documentation/git-checkout.txt: clarify usage

8 years agoMerge branch 'ta/api-index-doc' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:37:42 +0000 (20:37 -0800)]
Merge branch 'ta/api-index-doc' into maint

* ta/api-index-doc:
  Remove misleading date from api-index-skel.txt

8 years agoMerge branch 'as/doc-for-devs' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:37:33 +0000 (20:37 -0800)]
Merge branch 'as/doc-for-devs' into maint

* as/doc-for-devs:
  Documentation: move support for old compilers to CodingGuidelines
  SubmittingPatches: add convention of prefixing commit messages

8 years agoMerge branch 'sl/readme-gplv2' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:37:27 +0000 (20:37 -0800)]
Merge branch 'sl/readme-gplv2' into maint

* sl/readme-gplv2:
  README: it does not matter who the current maintainer is
  README: Git is released under the GPLv2, not just "the GPL"

8 years agoMerge branch 'jc/fetch-tags-doc' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:37:22 +0000 (20:37 -0800)]
Merge branch 'jc/fetch-tags-doc' into maint

* jc/fetch-tags-doc:
  fetch --tags: clarify documentation

8 years agoMerge branch 'nd/index-format-doc' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:37:09 +0000 (20:37 -0800)]
Merge branch 'nd/index-format-doc' into maint

* nd/index-format-doc:
  index-format.txt: clarify what is "invalid"

8 years agoMerge branch 'jk/mailmap-cleanup' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:36:42 +0000 (20:36 -0800)]
Merge branch 'jk/mailmap-cleanup' into maint

* jk/mailmap-cleanup:
  contrib: update stats/mailmap script
  .mailmap: normalize emails for Linus Torvalds
  .mailmap: normalize emails for Jeff King
  .mailmap: fix broken entry for Martin Langhoff
  .mailmap: match up some obvious names/emails

8 years agoMerge branch 'ta/doc-cleanup' into maint
Junio C Hamano [Sun, 23 Dec 2012 04:35:34 +0000 (20:35 -0800)]
Merge branch 'ta/doc-cleanup' into maint

* ta/doc-cleanup:
  Documentation: build html for all files in technical and howto
  Documentation/howto: convert plain text files to asciidoc
  Documentation/technical: convert plain text files to asciidoc
  Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
  Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
  Split over-long synopsis in git-fetch-pack.txt into several lines

8 years agoSort howto documents in howto-index.txt
Thomas Ackermann [Sat, 22 Dec 2012 18:34:27 +0000 (19:34 +0100)]
Sort howto documents in howto-index.txt

Howto documents in howto-index.txt were listed in a rather
random order. So better sort them.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-subtree: fix typo in manpage
Michael Schubert [Sat, 22 Dec 2012 14:46:02 +0000 (15:46 +0100)]
git-subtree: fix typo in manpage

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogit-subtree: ignore git-subtree executable
Michael Schubert [Sat, 22 Dec 2012 14:45:40 +0000 (15:45 +0100)]
git-subtree: ignore git-subtree executable

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoGit 1.8.1-rc3 v1.8.1-rc3
Junio C Hamano [Sat, 22 Dec 2012 19:48:47 +0000 (11:48 -0800)]
Git 1.8.1-rc3

The changes since -rc2 are mostly documentation updates.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'ta/new-command-howto'
Junio C Hamano [Fri, 21 Dec 2012 23:19:25 +0000 (15:19 -0800)]
Merge branch 'ta/new-command-howto'

* ta/new-command-howto:
  Move ./technical/api-command.txt to ./howto/new-command.txt

8 years agoMerge branch 'jc/doc-diff-blobs'
Junio C Hamano [Fri, 21 Dec 2012 23:19:13 +0000 (15:19 -0800)]
Merge branch 'jc/doc-diff-blobs'

"git diff <blob> <blob>" was not documented and was only hinted as
an extension to "git diff <commit> <commit> -- <pathspec>", but
comparison between two blobs are more special than that.  It does
not take any pathspec to begin with.

* jc/doc-diff-blobs:
  Documentation: Describe "git diff <blob> <blob>" separately

8 years agoMerge branch 'cr/doc-checkout-branch'
Junio C Hamano [Fri, 21 Dec 2012 23:19:08 +0000 (15:19 -0800)]
Merge branch 'cr/doc-checkout-branch'

Document the magic "git checkout <no-such-branch>" hack to create
local branch out of a remote tracking branch that hasn't been
documented so far.

* cr/doc-checkout-branch:
  Documentation/git-checkout.txt: document 70c9ac2 behavior
  Documentation/git-checkout.txt: clarify usage

8 years agoMerge branch 'ta/api-index-doc'
Junio C Hamano [Fri, 21 Dec 2012 23:19:04 +0000 (15:19 -0800)]
Merge branch 'ta/api-index-doc'

* ta/api-index-doc:
  Remove misleading date from api-index-skel.txt

8 years agoMerge branch 'jk/avoid-mailto-invalid-in-doc'
Junio C Hamano [Fri, 21 Dec 2012 23:18:57 +0000 (15:18 -0800)]
Merge branch 'jk/avoid-mailto-invalid-in-doc'

Avoids invalid sample e-mail addresses from becoming mailto links
in the formatted output.

* jk/avoid-mailto-invalid-in-doc:
  Documentation: don't link to example mail addresses

8 years agoMerge branch 'as/doc-for-devs'
Junio C Hamano [Fri, 21 Dec 2012 23:18:47 +0000 (15:18 -0800)]
Merge branch 'as/doc-for-devs'

It might be a better idea to move the text the bottom one adds to
the extended description from the quick checklist part.

* as/doc-for-devs:
  Documentation: move support for old compilers to CodingGuidelines
  SubmittingPatches: add convention of prefixing commit messages