git/git.git
4 years agoworktree.c: make find_shared_symref() return struct worktree *
Nguyễn Thái Ngọc Duy [Fri, 22 Apr 2016 13:01:27 +0000 (20:01 +0700)]
worktree.c: make find_shared_symref() return struct worktree *

This gives the caller more information and they can answer things like,
"is it the main worktree" or "is it the current worktree". The latter
question is needed for the "checkout a rebase branch" case later.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoworktree.c: store "id" instead of "git_dir"
Nguyễn Thái Ngọc Duy [Fri, 22 Apr 2016 13:01:26 +0000 (20:01 +0700)]
worktree.c: store "id" instead of "git_dir"

We can reconstruct git_dir from id quite easily. It's a bit hackier to
do the reverse.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agopath.c: add git_common_path() and strbuf_git_common_path()
Nguyễn Thái Ngọc Duy [Fri, 22 Apr 2016 13:01:25 +0000 (20:01 +0700)]
path.c: add git_common_path() and strbuf_git_common_path()

These are mostly convenient functions to reduce code duplication. Most
of the time, we should be able to get by with git_path() which handles
$GIT_COMMON_DIR internally. However there are a few cases where we need
to construct paths manually, for example some paths from a specific
worktree. These functions will enable that.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agodir.c: rename str(n)cmp_icase to fspath(n)cmp
Nguyễn Thái Ngọc Duy [Fri, 22 Apr 2016 13:01:24 +0000 (20:01 +0700)]
dir.c: rename str(n)cmp_icase to fspath(n)cmp

These functions compare two paths that are taken from file system.
Depending on the running file system, paths may need to be compared
case-sensitively or not, and maybe even something else in future. The
current names do not convey that well.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoFifth batch for post 2.8 cycle
Junio C Hamano [Mon, 18 Apr 2016 17:51:09 +0000 (10:51 -0700)]
Fifth batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'jk/branch-shortening-funny-symrefs'
Junio C Hamano [Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)]
Merge branch 'jk/branch-shortening-funny-symrefs'

A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).

* jk/branch-shortening-funny-symrefs:
  branch: fix shortening of non-remote symrefs

4 years agoMerge branch 'ky/branch-m-worktree'
Junio C Hamano [Mon, 18 Apr 2016 17:48:11 +0000 (10:48 -0700)]
Merge branch 'ky/branch-m-worktree'

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
  set_worktree_head_symref(): fix error message
  branch -m: update all per-worktree HEADs
  refs: add a new function set_worktree_head_symref

4 years agoMerge branch 'maint'
Junio C Hamano [Fri, 15 Apr 2016 01:59:09 +0000 (18:59 -0700)]
Merge branch 'maint'

* maint:
  Prepare for 2.8.2
  Start preparing for 2.8.2

4 years agoPrepare for 2.8.2
Junio C Hamano [Fri, 15 Apr 2016 01:58:11 +0000 (18:58 -0700)]
Prepare for 2.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'jv/merge-nothing-into-void' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:49 +0000 (18:57 -0700)]
Merge branch 'jv/merge-nothing-into-void' into maint

"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).

* jv/merge-nothing-into-void:
  merge: fix NULL pointer dereference when merging nothing into void

4 years agoMerge branch 'ss/commit-squash-msg' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:48 +0000 (18:57 -0700)]
Merge branch 'ss/commit-squash-msg' into maint

When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.

* ss/commit-squash-msg:
  commit: do not lose SQUASH_MSG contents

4 years agoMerge branch 'jk/send-email-rtrim-mailrc-alias' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)]
Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint

"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.

* jk/send-email-rtrim-mailrc-alias:
  send-email: ignore trailing whitespace in mailrc alias file

4 years agoMerge branch 'da/mergetool-delete-delete-conflict' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:47 +0000 (18:57 -0700)]
Merge branch 'da/mergetool-delete-delete-conflict' into maint

"git mergetool" did not work well with conflicts that both sides
deleted.

* da/mergetool-delete-delete-conflict:
  mergetool: honor tempfile configuration when resolving delete conflicts
  mergetool: support delete/delete conflicts

4 years agoMerge branch 'jk/startup-info' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)]
Merge branch 'jk/startup-info' into maint

The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.

* jk/startup-info:
  use setup_git_directory() in test-* programs
  grep: turn off gitlink detection for --no-index
  mailmap: do not resolve blobs in a non-repository
  remote: don't resolve HEAD in non-repository
  setup: set startup_info->have_repository more reliably
  setup: make startup_info available everywhere

4 years agoMerge branch 'jk/getwholeline-getdelim-empty' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)]
Merge branch 'jk/getwholeline-getdelim-empty' into maint

strbuf_getwholeline() did not NUL-terminate the buffer on certain
corner cases in its error codepath.

* jk/getwholeline-getdelim-empty:
  strbuf_getwholeline: NUL-terminate getdelim buffer on error

4 years agoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:45 +0000 (18:57 -0700)]
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint

A small memory leak in an error codepath has been plugged in xdiff
code.

* rj/xdiff-prepare-plug-leak-on-error-codepath:
  xdiff/xprepare: fix a memory leak
  xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

4 years agoMerge branch 'gf/fetch-pack-direct-object-fetch' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:44 +0000 (18:57 -0700)]
Merge branch 'gf/fetch-pack-direct-object-fetch' into maint

Fetching of history by naming a commit object name directly didn't
work across remote-curl transport.

* gf/fetch-pack-direct-object-fetch:
  fetch-pack: update the documentation for "<refs>..." arguments
  fetch-pack: fix object_id of exact sha1

4 years agoMerge branch 'jk/rev-parse-local-env-vars' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:44 +0000 (18:57 -0700)]
Merge branch 'jk/rev-parse-local-env-vars' into maint

The "--local-env-vars" and "--resolve-git-dir" options of "git
rev-parse" failed to work outside a repository when the command's
option parsing was rewritten in 1.8.5 era.

* jk/rev-parse-local-env-vars:
  rev-parse: let some options run outside repository
  t1515: add tests for rev-parse out-of-repo helpers

4 years agoMerge branch 'jk/config-get-urlmatch' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:57:43 +0000 (18:57 -0700)]
Merge branch 'jk/config-get-urlmatch' into maint

"git config --get-urlmatch", unlike other variants of the "git
config --get" family, did not signal error with its exit status
when there was no matching configuration.

* jk/config-get-urlmatch:
  Documentation/git-config: fix --get-all description
  Documentation/git-config: use bulleted list for exit codes
  config: fail if --get-urlmatch finds no value

4 years agoMerge branch 'pb/t7502-drop-dup' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:18 +0000 (18:37 -0700)]
Merge branch 'pb/t7502-drop-dup' into maint

Code clean-up.

* pb/t7502-drop-dup:
  t/t7502 : drop duplicate test

4 years agoMerge branch 'jk/test-httpd-config-nosystem' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:17 +0000 (18:37 -0700)]
Merge branch 'jk/test-httpd-config-nosystem' into maint

The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.

* jk/test-httpd-config-nosystem:
  t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env

4 years agoMerge branch 'sb/clone-t57-t56' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:16 +0000 (18:37 -0700)]
Merge branch 'sb/clone-t57-t56' into maint

Rename bunch of tests on "git clone" for better organization.

* sb/clone-t57-t56:
  clone tests: rename t57* => t56*

4 years agoMerge branch 'jk/credential-cache-comment-exit' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:16 +0000 (18:37 -0700)]
Merge branch 'jk/credential-cache-comment-exit' into maint

A code clarification.

* jk/credential-cache-comment-exit:
  credential-cache--daemon: clarify "exit" action semantics

4 years agoMerge branch 'jc/index-pack' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)]
Merge branch 'jc/index-pack' into maint

Code clean-up.

* jc/index-pack:
  index-pack: add a helper function to derive .idx/.keep filename
  index-pack: correct --keep[=<msg>]

4 years agoMerge branch 'ss/exc-flag-is-a-collection-of-bits' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:15 +0000 (18:37 -0700)]
Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint

Code clean-up.

* ss/exc-flag-is-a-collection-of-bits:
  dir: store EXC_FLAG_* values in unsigned integers

4 years agoMerge branch 'mp/upload-pack-use-embedded-args' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)]
Merge branch 'mp/upload-pack-use-embedded-args' into maint

The embedded args argv-array in the child process is used to build
the command line to run pack-objects instead of using a separate
array of strings.

* mp/upload-pack-use-embedded-args:
  upload-pack: use argv_array for pack_objects

4 years agoMerge branch 'oa/doc-diff-check' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)]
Merge branch 'oa/doc-diff-check' into maint

A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers

4 years agoMerge branch 'pb/opt-cmdmode-doc' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)]
Merge branch 'pb/opt-cmdmode-doc' into maint

Minor API documentation update.

* pb/opt-cmdmode-doc:
  api-parse-options.txt: document OPT_CMDMODE()

4 years agoMerge branch 'nd/apply-doc' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:13 +0000 (18:37 -0700)]
Merge branch 'nd/apply-doc' into maint

A minor documentation update.

* nd/apply-doc:
  git-apply.txt: mention the behavior inside a subdir
  git-apply.txt: remove a space

4 years agoMerge branch 'cc/doc-recommend-performance-trace-to-file' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)]
Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint

A minor documentation update.

* cc/doc-recommend-performance-trace-to-file:
  Documentation: talk about pager in api-trace.txt

4 years agoMerge branch 'mm/lockfile-error-message' into maint
Junio C Hamano [Fri, 15 Apr 2016 01:37:12 +0000 (18:37 -0700)]
Merge branch 'mm/lockfile-error-message' into maint

* mm/lockfile-error-message:
  lockfile: improve error message when lockfile exists
  lockfile: mark strings for translation

4 years agoStart preparing for 2.8.2
Junio C Hamano [Wed, 13 Apr 2016 23:30:00 +0000 (16:30 -0700)]
Start preparing for 2.8.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoFourth batch for post 2.8 cycle
Junio C Hamano [Wed, 13 Apr 2016 21:19:29 +0000 (14:19 -0700)]
Fourth batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'
Junio C Hamano [Wed, 13 Apr 2016 21:12:40 +0000 (14:12 -0700)]
Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'

When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion.  It has been
corrected.

* tb/blame-force-read-cache-to-workaround-safe-crlf:
  correct blame for files commited with CRLF

4 years agoMerge branch 'mg/complete-cherry-mark-to-log'
Junio C Hamano [Wed, 13 Apr 2016 21:12:39 +0000 (14:12 -0700)]
Merge branch 'mg/complete-cherry-mark-to-log'

The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".

* mg/complete-cherry-mark-to-log:
  completion: complete --cherry-mark for git log

4 years agoMerge branch 'ep/trace-doc-sample-fix'
Junio C Hamano [Wed, 13 Apr 2016 21:12:38 +0000 (14:12 -0700)]
Merge branch 'ep/trace-doc-sample-fix'

Fix a typo in an example in the trace API documentation.

* ep/trace-doc-sample-fix:
  api-trace.txt: fix typo

4 years agoMerge branch 'jc/makefile-redirection-stderr'
Junio C Hamano [Wed, 13 Apr 2016 21:12:37 +0000 (14:12 -0700)]
Merge branch 'jc/makefile-redirection-stderr'

A minor fix in the Makefile.

* jc/makefile-redirection-stderr:
  Makefile: fix misdirected redirections

4 years agoMerge branch 'lt/pretty-expand-tabs'
Junio C Hamano [Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)]
Merge branch 'lt/pretty-expand-tabs'

When "git log" shows the log message indented by 4-spaces, the
remainder of a line after a HT does not align in the way the author
originally intended.  The command now expands tabs by default in
such a case, and allows the users to override it with a new option,
'--no-expand-tabs'.

* lt/pretty-expand-tabs:
  pretty: test --expand-tabs
  pretty: allow tweaking tabwidth in --expand-tabs
  pretty: enable --expand-tabs by default for selected pretty formats
  pretty: expand tabs in indented logs to make things line up properly

4 years agoMerge branch 'mj/pull-rebase-autostash'
Junio C Hamano [Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)]
Merge branch 'mj/pull-rebase-autostash'

"git pull --rebase" learned "--[no-]autostash" option, so that
the rebase.autostash configuration variable set to true can be
overridden from the command line.

* mj/pull-rebase-autostash:
  t5520: test --[no-]autostash with pull.rebase=true
  t5520: reduce commom lines of code
  t5520: factor out common "failing autostash" code
  t5520: factor out common "successful autostash" code
  t5520: use better test to check stderr output
  t5520: ensure consistent test conditions
  t5520: use consistent capitalization in test titles
  pull --rebase: add --[no-]autostash flag
  git-pull.c: introduce git_pull_config()

4 years agoMerge branch 'jn/mergetools-examdiff'
Junio C Hamano [Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)]
Merge branch 'jn/mergetools-examdiff'

"git mergetools" learned to drive ExamDiff.

* jn/mergetools-examdiff:
  mergetools: add support for ExamDiff
  mergetools: create mergetool_find_win32_cmd() helper function for winmerge

4 years agoMerge branch 'es/format-patch-doc-hide-no-patch'
Junio C Hamano [Wed, 13 Apr 2016 21:12:35 +0000 (14:12 -0700)]
Merge branch 'es/format-patch-doc-hide-no-patch'

"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command.  We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.

* es/format-patch-doc-hide-no-patch:
  git-format-patch.txt: don't show -s as shorthand for multiple options

4 years agoMerge branch 'js/mingw-tests-2.8'
Junio C Hamano [Wed, 13 Apr 2016 21:12:34 +0000 (14:12 -0700)]
Merge branch 'js/mingw-tests-2.8'

Code clean-up.

* js/mingw-tests-2.8:
  Windows: shorten code by re-using convert_slashes()

4 years agoMerge branch 'cc/apply'
Junio C Hamano [Wed, 13 Apr 2016 21:12:34 +0000 (14:12 -0700)]
Merge branch 'cc/apply'

Minor code clean-up.

* cc/apply:
  builtin/apply: free patch when parse_chunk() fails
  builtin/apply: handle parse_binary() failure
  apply: remove unused call to free() in gitdiff_{old,new}name()
  builtin/apply: get rid of useless 'name' variable

4 years agoMerge branch 'sb/misc-cleanups'
Junio C Hamano [Wed, 13 Apr 2016 21:12:34 +0000 (14:12 -0700)]
Merge branch 'sb/misc-cleanups'

Assorted minor clean-ups.

* sb/misc-cleanups:
  credential-cache, send_request: close fd when done
  bundle: don't leak an fd in case of early return
  abbrev_sha1_in_line: don't leak memory
  notes: don't leak memory in git_config_get_notes_strategy

4 years agoMerge branch 'sk/send-pack-all-fix'
Junio C Hamano [Wed, 13 Apr 2016 21:12:33 +0000 (14:12 -0700)]
Merge branch 'sk/send-pack-all-fix'

"git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.

* sk/send-pack-all-fix:
  git-send-pack: fix --all option when used with directory

4 years agoMerge branch 'sg/diff-multiple-identical-renames'
Junio C Hamano [Wed, 13 Apr 2016 21:12:32 +0000 (14:12 -0700)]
Merge branch 'sg/diff-multiple-identical-renames'

"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.

* sg/diff-multiple-identical-renames:
  diffcore: fix iteration order of identical files during rename detection

4 years agoMerge branch 'kn/for-each-tag-branch'
Junio C Hamano [Wed, 13 Apr 2016 21:12:31 +0000 (14:12 -0700)]
Merge branch 'kn/for-each-tag-branch'

A minor documentation update.

* kn/for-each-tag-branch:
  for-each-ref: fix description of '--contains' in manpage

4 years agoMerge branch 'ky/branch-d-worktree'
Junio C Hamano [Wed, 13 Apr 2016 21:12:30 +0000 (14:12 -0700)]
Merge branch 'ky/branch-d-worktree'

When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree

* ky/branch-d-worktree:
  branch -d: refuse deleting a branch which is currently checked out

4 years agoMerge branch 'rz/worktree-no-checkout'
Junio C Hamano [Wed, 13 Apr 2016 21:12:30 +0000 (14:12 -0700)]
Merge branch 'rz/worktree-no-checkout'

"git worktree add" can be given "--no-checkout" option to only
create an empty worktree without checking out the files.

* rz/worktree-no-checkout:
  worktree: add: introduce --checkout option

4 years agoMerge branch 'rt/rebase-i-shorten-stop-report'
Junio C Hamano [Wed, 13 Apr 2016 21:12:30 +0000 (14:12 -0700)]
Merge branch 'rt/rebase-i-shorten-stop-report'

The commit object name reported when "rebase -i" stops has been
shortened.

* rt/rebase-i-shorten-stop-report:
  rebase-i: print an abbreviated hash when stop for editing

4 years agoMerge branch 'rt/completion-help'
Junio C Hamano [Wed, 13 Apr 2016 21:12:29 +0000 (14:12 -0700)]
Merge branch 'rt/completion-help'

Shell completion (in contrib/) updates.

* rt/completion-help:
  completion: add 'revisions' and 'everyday' to 'git help'
  completion: add option '--guides' to 'git help'

4 years agoMerge branch 'ak/use-hashmap-iter-first-in-submodule-config'
Junio C Hamano [Wed, 13 Apr 2016 21:12:29 +0000 (14:12 -0700)]
Merge branch 'ak/use-hashmap-iter-first-in-submodule-config'

Minor code cleanup.

* ak/use-hashmap-iter-first-in-submodule-config:
  submodule-config: use hashmap_iter_first()

4 years agoMerge branch 'jk/check-repository-format'
Junio C Hamano [Wed, 13 Apr 2016 21:12:28 +0000 (14:12 -0700)]
Merge branch 'jk/check-repository-format'

The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.

* jk/check-repository-format:
  verify_repository_format: mark messages for translation
  setup: drop repository_format_version global
  setup: unify repository version callbacks
  init: use setup.c's repo version verification
  setup: refactor repo format reading and verification
  config: drop git_config_early
  check_repository_format_gently: stop using git_config_early
  lazily load core.sharedrepository
  wrap shared_repository global in get/set accessors
  setup: document check_repository_format()

4 years agoThird batch for post 2.8 cycle
Junio C Hamano [Fri, 8 Apr 2016 21:34:11 +0000 (14:34 -0700)]
Third batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'ss/msvc'
Junio C Hamano [Fri, 8 Apr 2016 21:29:13 +0000 (14:29 -0700)]
Merge branch 'ss/msvc'

Build updates for MSVC.

* ss/msvc:
  MSVC: use shipped headers instead of fallback definitions
  MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

4 years agoMerge branch 'oa/doc-diff-check'
Junio C Hamano [Fri, 8 Apr 2016 21:29:13 +0000 (14:29 -0700)]
Merge branch 'oa/doc-diff-check'

A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers

4 years agoMerge branch 'pb/opt-cmdmode-doc'
Junio C Hamano [Fri, 8 Apr 2016 21:29:12 +0000 (14:29 -0700)]
Merge branch 'pb/opt-cmdmode-doc'

Minor API documentation update.

* pb/opt-cmdmode-doc:
  api-parse-options.txt: document OPT_CMDMODE()

4 years agoMerge branch 'nd/apply-report-skip'
Junio C Hamano [Fri, 8 Apr 2016 21:29:12 +0000 (14:29 -0700)]
Merge branch 'nd/apply-report-skip'

"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.

* nd/apply-report-skip:
  apply: report patch skipping in verbose mode

4 years agoMerge branch 'nd/apply-doc'
Junio C Hamano [Fri, 8 Apr 2016 21:29:12 +0000 (14:29 -0700)]
Merge branch 'nd/apply-doc'

A minor documentation update.

* nd/apply-doc:
  git-apply.txt: mention the behavior inside a subdir
  git-apply.txt: remove a space

4 years agoMerge branch 'jc/merge-refuse-new-root'
Junio C Hamano [Fri, 8 Apr 2016 21:29:11 +0000 (14:29 -0700)]
Merge branch 'jc/merge-refuse-new-root'

"git merge" used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project.  The command has been taught not to allow this by
default, with an escape hatch "--allow-unrelated-histories" option
to be used in a rare event that merges histories of two projects
that started their lives independently.

* jc/merge-refuse-new-root:
  merge: refuse to create too cool a merge by default

4 years agoset_worktree_head_symref(): fix error message
Kazuki Yamaguchi [Fri, 8 Apr 2016 08:03:07 +0000 (17:03 +0900)]
set_worktree_head_symref(): fix error message

Emit an informative error when failed to hold lock of HEAD.

2233066e (refs: add a new function set_worktree_head_symref,
2016-03-27) added set_worktree_head_symref(), but this is missing a
call to unable_to_lock_message() after hold_lock_file_for_update()
fails, so it emits an empty error message:

  % git branch -m oldname newname
  error:
  error: HEAD of working tree /path/to/wt is not updated
  fatal: Branch renamed to newname, but HEAD is not updated!

Thanks to Eric Sunshine for pointing this out.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoSecond batch for post 2.8 cycle
Junio C Hamano [Wed, 6 Apr 2016 18:44:24 +0000 (11:44 -0700)]
Second batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMerge branch 'la/tag-force-signing-annotated-tags'
Junio C Hamano [Wed, 6 Apr 2016 18:39:13 +0000 (11:39 -0700)]
Merge branch 'la/tag-force-signing-annotated-tags'

"git tag" can create an annotated tag without explicitly given an
"-a" (or "-s") option (i.e. when a tag message is given).  A new
configuration variable, tag.forceSignAnnotated, can be used to tell
the command to create signed tag in such a situation.

* la/tag-force-signing-annotated-tags:
  tag: add the option to force signing of annotated tags

4 years agoMerge branch 'jk/submodule-c-credential'
Junio C Hamano [Wed, 6 Apr 2016 18:39:12 +0000 (11:39 -0700)]
Merge branch 'jk/submodule-c-credential'

"git -c credential.<var>=<value> submodule" can now be used to
propagate configuration variables related to credential helper
down to the submodules.

* jk/submodule-c-credential:
  git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
  git: submodule honor -c credential.* from command line
  quote: implement sq_quotef()
  submodule: fix segmentation fault in submodule--helper clone
  submodule: fix submodule--helper clone usage
  submodule: check argc count for git submodule--helper clone
  submodule: don't pass empty string arguments to submodule--helper clone

4 years agoMerge branch 'jv/merge-nothing-into-void'
Junio C Hamano [Wed, 6 Apr 2016 18:39:11 +0000 (11:39 -0700)]
Merge branch 'jv/merge-nothing-into-void'

"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).

* jv/merge-nothing-into-void:
  merge: fix NULL pointer dereference when merging nothing into void

4 years agoMerge branch 'ss/commit-squash-msg'
Junio C Hamano [Wed, 6 Apr 2016 18:39:10 +0000 (11:39 -0700)]
Merge branch 'ss/commit-squash-msg'

When "git merge --squash" stopped due to conflict, the concluding
"git commit" failed to read in the SQUASH_MSG that shows the log
messages from all the squashed commits.

* ss/commit-squash-msg:
  commit: do not lose SQUASH_MSG contents

4 years agoMerge branch 'sb/rebase-x'
Junio C Hamano [Wed, 6 Apr 2016 18:39:09 +0000 (11:39 -0700)]
Merge branch 'sb/rebase-x'

"git rebase -x" can be used without passing "-i" option.

* sb/rebase-x:
  t3404: cleanup double empty lines between tests
  rebase: decouple --exec from --interactive

4 years agoMerge branch 'jk/test-httpd-config-nosystem'
Junio C Hamano [Wed, 6 Apr 2016 18:39:08 +0000 (11:39 -0700)]
Merge branch 'jk/test-httpd-config-nosystem'

The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.

* jk/test-httpd-config-nosystem:
  t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env

4 years agoMerge branch 'jk/send-email-rtrim-mailrc-alias'
Junio C Hamano [Wed, 6 Apr 2016 18:39:07 +0000 (11:39 -0700)]
Merge branch 'jk/send-email-rtrim-mailrc-alias'

"git send-email" had trouble parsing alias file in mailrc format
when lines in it had trailing whitespaces on them.

* jk/send-email-rtrim-mailrc-alias:
  send-email: ignore trailing whitespace in mailrc alias file

4 years agoMerge branch 'jk/credential-cache-comment-exit'
Junio C Hamano [Wed, 6 Apr 2016 18:39:06 +0000 (11:39 -0700)]
Merge branch 'jk/credential-cache-comment-exit'

A code clarification.

* jk/credential-cache-comment-exit:
  credential-cache--daemon: clarify "exit" action semantics

4 years agoMerge branch 'sb/clone-t57-t56'
Junio C Hamano [Wed, 6 Apr 2016 18:39:05 +0000 (11:39 -0700)]
Merge branch 'sb/clone-t57-t56'

Rename bunch of tests on "git clone" for better organization.

* sb/clone-t57-t56:
  clone tests: rename t57* => t56*

4 years agoMerge branch 'ls/p4-map-user'
Junio C Hamano [Wed, 6 Apr 2016 18:39:05 +0000 (11:39 -0700)]
Merge branch 'ls/p4-map-user'

"git p4" now allows P4 author names to be mapped to Git author
names.

* ls/p4-map-user:
  git-p4: map a P4 user to Git author name and email address

4 years agoMerge branch 'cc/doc-recommend-performance-trace-to-file'
Junio C Hamano [Wed, 6 Apr 2016 18:39:04 +0000 (11:39 -0700)]
Merge branch 'cc/doc-recommend-performance-trace-to-file'

A minor documentation update.

* cc/doc-recommend-performance-trace-to-file:
  Documentation: talk about pager in api-trace.txt

4 years agoMerge branch 'pb/t7502-drop-dup'
Junio C Hamano [Wed, 6 Apr 2016 18:39:03 +0000 (11:39 -0700)]
Merge branch 'pb/t7502-drop-dup'

Code clean-up.

* pb/t7502-drop-dup:
  t/t7502 : drop duplicate test

4 years agoMerge branch 'da/mergetool-delete-delete-conflict'
Junio C Hamano [Wed, 6 Apr 2016 18:39:02 +0000 (11:39 -0700)]
Merge branch 'da/mergetool-delete-delete-conflict'

"git mergetool" did not work well with conflicts that both sides
deleted.

* da/mergetool-delete-delete-conflict:
  mergetool: honor tempfile configuration when resolving delete conflicts
  mergetool: support delete/delete conflicts

4 years agoMerge branch 'sb/submodule-parallel-update'
Junio C Hamano [Wed, 6 Apr 2016 18:39:01 +0000 (11:39 -0700)]
Merge branch 'sb/submodule-parallel-update'

A major part of "git submodule update" has been ported to C to take
advantage of the recently added framework to run download tasks in
parallel.

* sb/submodule-parallel-update:
  clone: allow an explicit argument for parallel submodule clones
  submodule update: expose parallelism to the user
  submodule helper: remove double 'fatal: ' prefix
  git submodule update: have a dedicated helper for cloning
  run_processes_parallel: rename parameters for the callbacks
  run_processes_parallel: treat output of children as byte array
  submodule update: direct error message to stderr
  fetching submodules: respect `submodule.fetchJobs` config option
  submodule-config: drop check against NULL
  submodule-config: keep update strategy around

4 years agoMerge branch 'ss/receive-pack-parse-options'
Junio C Hamano [Wed, 6 Apr 2016 18:38:59 +0000 (11:38 -0700)]
Merge branch 'ss/receive-pack-parse-options'

The command line argument parser for "receive-pack" has been
rewritten to use parse-options.

* ss/receive-pack-parse-options:
  builtin/receive-pack.c: use parse_options API

4 years agoMerge branch 'ss/exc-flag-is-a-collection-of-bits'
Junio C Hamano [Wed, 6 Apr 2016 18:38:59 +0000 (11:38 -0700)]
Merge branch 'ss/exc-flag-is-a-collection-of-bits'

Code clean-up.

* ss/exc-flag-is-a-collection-of-bits:
  dir: store EXC_FLAG_* values in unsigned integers

4 years agocorrect blame for files commited with CRLF
Torsten Bögershausen [Tue, 5 Apr 2016 19:23:54 +0000 (21:23 +0200)]
correct blame for files commited with CRLF

git blame reports lines as not "Not Committed Yet" when they have
CRLF in the index, CRLF in the worktree and core.autocrlf is true.

Since commit c4805393 (autocrlf: Make it work also for un-normalized
repositories, 2010-05-12), files that have CRLF in the index are not
normalized at commit when core.autocrl is set.

Add a call to read_cache() early in fake_working_tree_commit(),
before calling convert_to_git().

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agocompletion: complete --cherry-mark for git log
Michael J Gruber [Tue, 5 Apr 2016 10:45:35 +0000 (12:45 +0200)]
completion: complete --cherry-mark for git log

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoapi-trace.txt: fix typo
Elia Pinto [Tue, 5 Apr 2016 10:05:23 +0000 (10:05 +0000)]
api-trace.txt: fix typo

The correct api is trace_printf_key(), not trace_print_key().

Also do not throw a random string at printf(3)-like function;
instead, feed it as a parameter that is fed to a "%s" conversion
specifier.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoMakefile: fix misdirected redirections
Junio C Hamano [Tue, 5 Apr 2016 07:02:14 +0000 (00:02 -0700)]
Makefile: fix misdirected redirections

In general "echo 2>&1 $msg" to redirect a possible error message
that comes from 'echo' itself into the same standard output stream
$msg is getting written to does not make any sense; it is not like
we are expecting to see any errors out of 'echo' in these statements,
and even if it were the case, there is no reason to prevent the
error messages from being sent to the standard error stream.

These are clearly meant to send the argument given to echo to the
standard error stream as error messages.  Correctly redirect by
saying "send what is written to the standard output to the standard
error", i.e. "1>&2" aka ">&2".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agobranch: fix shortening of non-remote symrefs
Jeff King [Sun, 3 Apr 2016 04:14:26 +0000 (00:14 -0400)]
branch: fix shortening of non-remote symrefs

Commit aedcb7d (branch.c: use 'ref-filter' APIs, 2015-09-23)
adjusted the symref-printing code to look like this:

    if (item->symref) {
    skip_prefix(item->symref, "refs/remotes/", &desc);
    strbuf_addf(&out, " -> %s", desc);
    }

This has three bugs in it:

  1. It always skips past "refs/remotes/", instead of
     skipping past the prefix associated with the branch we
     are showing (so commonly we see "refs/remotes/" for the
     refs/remotes/origin/HEAD symref, but the previous code
     would skip "refs/heads/" when showing a symref it found
     in refs/heads/.

  2. If skip_prefix() does not match, it leaves "desc"
     untouched, and we show whatever happened to be in it
     (which is the refname from a call to skip_prefix()
     earlier in the function).

  3. If we do match with skip_prefix(), we stomp on the
     "desc" variable, which is later passed to
     add_verbose_info(). We probably want to retain the
     original refname there (though it likely doesn't matter
     in practice, since after all, one points to the other).

The fix to match the original code is fairly easy: record
the prefix to strip based on item->kind, and use it here.
However, since we already have a local variable named "prefix",
let's give the two prefixes verbose names so we don't
confuse them.

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agopretty: test --expand-tabs
Junio C Hamano [Mon, 4 Apr 2016 23:09:18 +0000 (16:09 -0700)]
pretty: test --expand-tabs

The test prepares a simple commit with HT on its log message lines,
and makes sure that

 - formats that should or should not expand tabs by default do or do
   not expand tabs respectively,

 - with explicit --expand-tabs=<N> and short-hands --expand-tabs
   (equivalent to --expand-tabs=8) and --no-expand-tabs (equivalent
   to --expand-tabs=0) before or after the explicit --pretty=$fmt,
   the tabs are expanded (or not expanded) accordingly.

The tests use the second line of the log message for formats other
than --pretty=short, primarily because the first line of the email
format is handled specially to add the [PATCH] prefix, etc. in a
separate codepath (--pretty=short uses the first line because there
is no other line to test).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoWindows: shorten code by re-using convert_slashes()
Johannes Sixt [Sat, 2 Apr 2016 19:03:14 +0000 (21:03 +0200)]
Windows: shorten code by re-using convert_slashes()

Make a few more spots more readable by using the recently introduced,
Windows-specific helper.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agogit-format-patch.txt: don't show -s as shorthand for multiple options
Eric Sunshine [Sun, 27 Mar 2016 21:26:07 +0000 (17:26 -0400)]
git-format-patch.txt: don't show -s as shorthand for multiple options

git-format-patch recognizes -s as shorthand only for --signoff, however,
its documentation shows -s as shorthand for both --signoff and
--no-patch. Resolve this confusion by suppressing the bogus -s shorthand
for --no-patch.

While here, also avoid showing the --no-patch option in git-format-patch
documentation since it doesn't make sense to ask to suppress the patch
while at the same time explicitly asking to format the patch (which,
after all, is the purpose of git-format-patch).

Reported-by: Kevin Brodsky <corax26@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agobranch -m: update all per-worktree HEADs
Kazuki Yamaguchi [Sun, 27 Mar 2016 14:37:14 +0000 (23:37 +0900)]
branch -m: update all per-worktree HEADs

When renaming a branch, currently only the HEAD of current working tree
is updated, but it must update HEADs of all working trees which point at
the old branch.

This is the current behavior, /path/to/wt's HEAD is not updated:

  % git worktree list
  /path/to     2c3c5f2 [master]
  /path/to/wt  2c3c5f2 [oldname]
  % git branch -m master master2
  % git worktree list
  /path/to     2c3c5f2 [master2]
  /path/to/wt  2c3c5f2 [oldname]
  % git branch -m oldname newname
  % git worktree list
  /path/to     2c3c5f2 [master2]
  /path/to/wt  0000000 [oldname]

This patch fixes this issue by updating all relevant worktree HEADs
when renaming a branch.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agorefs: add a new function set_worktree_head_symref
Kazuki Yamaguchi [Sun, 27 Mar 2016 14:37:13 +0000 (23:37 +0900)]
refs: add a new function set_worktree_head_symref

Add a new function set_worktree_head_symref, to update HEAD symref for
the specified worktree.

To update HEAD of a linked working tree,
create_symref("worktrees/$work_tree/HEAD", "refs/heads/$branch", msg)
could be used. However when it comes to updating HEAD of the main
working tree, it is unusable because it uses $GIT_DIR for
worktree-specific symrefs (HEAD).

The new function takes git_dir (real directory) as an argument, and
updates HEAD of the working tree. This function will be used when
renaming a branch.

Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Acked-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: test --[no-]autostash with pull.rebase=true
Mehul Jain [Sat, 2 Apr 2016 17:58:32 +0000 (23:28 +0530)]
t5520: test --[no-]autostash with pull.rebase=true

The "--[no-]autostash" options for git-pull are only valid in
rebase mode (i.e. either --rebase is used or pull.rebase=true).
Existing tests already check the cases when --rebase is used but
fail to check for pull.rebase=true case.

Add two new tests to check that the --[no-]autostash options work
with pull.rebase=true.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: reduce commom lines of code
Mehul Jain [Sat, 2 Apr 2016 17:58:31 +0000 (23:28 +0530)]
t5520: reduce commom lines of code

These two tests are almost similar and thus can be folded in a for-loop.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: factor out common "failing autostash" code
Mehul Jain [Sat, 2 Apr 2016 17:58:30 +0000 (23:28 +0530)]
t5520: factor out common "failing autostash" code

Three tests contains repetitive lines of code.

Factor out common code into test_pull_autostash_fail() and then call it in
these tests.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: factor out common "successful autostash" code
Mehul Jain [Sat, 2 Apr 2016 17:58:29 +0000 (23:28 +0530)]
t5520: factor out common "successful autostash" code

Four tests contains repetitive lines of code.

Factor out common code into test_pull_autostash() and then call it in
these tests.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: use better test to check stderr output
Mehul Jain [Sat, 2 Apr 2016 17:58:28 +0000 (23:28 +0530)]
t5520: use better test to check stderr output

Checking stderr output using test_i18ncmp may lead to test failure as
some shells write trace output to stderr when run under 'set -x'.

Use test_i18ngrep instead of test_i18ncmp.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: ensure consistent test conditions
Mehul Jain [Sat, 2 Apr 2016 17:58:27 +0000 (23:28 +0530)]
t5520: ensure consistent test conditions

Test title says that tests are done with rebase.autostash unset,
but does not take any action to make sure that it is indeed unset.
This may lead to test failure if future changes somehow pollutes
the configuration globally.

Ensure consistent test conditions by explicitly unsetting
rebase.autostash.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agot5520: use consistent capitalization in test titles
Mehul Jain [Sat, 2 Apr 2016 17:58:26 +0000 (23:28 +0530)]
t5520: use consistent capitalization in test titles

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agomergetools: add support for ExamDiff
Jacob Nisnevich [Fri, 25 Mar 2016 23:17:57 +0000 (16:17 -0700)]
mergetools: add support for ExamDiff

Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agomergetools: create mergetool_find_win32_cmd() helper function for winmerge
Jacob Nisnevich [Fri, 25 Mar 2016 23:17:56 +0000 (16:17 -0700)]
mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoFirst batch for post 2.8 cycle
Junio C Hamano [Sun, 3 Apr 2016 17:55:36 +0000 (10:55 -0700)]
First batch for post 2.8 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
4 years agoSync with Git 2.8.1
Junio C Hamano [Sun, 3 Apr 2016 17:54:38 +0000 (10:54 -0700)]
Sync with Git 2.8.1

4 years agoMerge branch 'jk/startup-info'
Junio C Hamano [Sun, 3 Apr 2016 17:29:35 +0000 (10:29 -0700)]
Merge branch 'jk/startup-info'

The startup_info data, which records if we are working inside a
repository (among other things), are now uniformly available to Git
subcommand implementations, and Git avoids attempting to touch
references when we are not in a repository.

* jk/startup-info:
  use setup_git_directory() in test-* programs
  grep: turn off gitlink detection for --no-index
  mailmap: do not resolve blobs in a non-repository
  remote: don't resolve HEAD in non-repository
  setup: set startup_info->have_repository more reliably
  setup: make startup_info available everywhere