Junio C Hamano 843d94b3cd Merge branch 'ew/empty-merge-with-dirty-index' ...

"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge

2018-01-05 13:28:09 -08:00

..

add.c

Merge branch 'tb/add-renormalize'

2017-11-27 11:06:37 +09:00

am.c

Merge branch 'ew/empty-merge-with-dirty-index'

2018-01-05 13:28:09 -08:00

annotate.c

…

apply.c

apply: move lockfile into apply_state

2017-10-06 10:07:18 +09:00

archive.c

…

bisect--helper.c

bisect: mention "view" as an alternative to "visualize"

2017-11-13 10:51:14 +09:00

blame.c

diff: make struct diff_flags members lowercase

2017-11-01 11:51:40 +09:00

branch.c

Merge branch 'ks/branch-cleanup'

2017-12-27 11:16:25 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/diff-blob' into maint

2017-10-18 14:19:01 +09:00

check-attr.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

check-ignore.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

check-mailmap.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

check-ref-format.c

Merge branch 'jc/check-ref-format-oor' into maint

2017-11-15 12:04:57 +09:00

checkout-index.c

checkout-index: simplify locking logic

2017-10-06 10:07:18 +09:00

checkout.c

Merge branch 'ks/branch-cleanup'

2017-12-27 11:16:25 -08:00

clean.c

Merge branch 'jk/ref-filter-colors-fix'

2017-10-18 10:19:08 +09:00

clone.c

Merge branch 'jt/transport-hide-vtable'

2017-12-28 14:08:47 -08:00

column.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

commit-tree.c

Merge branch 'rk/commit-tree-make-F-verbatim'

2017-09-19 10:47:57 +09:00

commit.c

Merge branch 'ma/reduce-heads-leakfix' into maint

2017-11-27 10:57:02 +09:00

config.c

config: add --expiry-date

2017-11-18 12:31:29 +09:00

count-objects.c

pack: move open_pack_index(), parse_pack_index()

2017-08-23 15:12:06 -07:00

credential.c

…

describe.c

Merge branch 'sb/describe-blob'

2017-12-28 14:08:50 -08:00

diff-files.c

submodule: remove gitmodules_config

2017-08-03 13:11:02 -07:00

diff-index.c

Merge branch 'ma/builtin-unleak'

2017-10-07 16:27:55 +09:00

diff-tree.c

diff-tree: read the index so attribute checks work in bare repositories

2017-12-06 14:49:18 -08:00

diff.c

Switch empty tree and blob lookups to use hash abstraction

2017-11-13 13:20:44 +09:00

difftool.c

read-cache: leave lock in right state in write_locked_index()

2017-10-07 10:20:56 +09:00

fast-export.c

decorate: clean up and document API

2017-12-08 09:16:27 -08:00

fetch-pack.c

…

fetch.c

Merge branch 'jt/transport-hide-vtable'

2017-12-28 14:08:47 -08:00

fmt-merge-msg.c

Merge branch 'rs/fmt-merge-msg-string-leak-fix'

2017-12-27 11:16:23 -08:00

for-each-ref.c

provide --color option for all ref-filter users

2017-10-04 11:35:29 +09:00

fsck.c

Merge branch 'bp/read-index-from-skip-verification'

2017-11-15 12:14:37 +09:00

gc.c

Merge branch 'aw/gc-lockfile-fscanf-fix' into maint

2017-10-18 14:18:59 +09:00

get-tar-commit-id.c

distinguish error versus short read from read_in_full()

2017-09-27 15:45:24 +09:00

grep.c

Merge branch 'bw/pathspec-match-submodule-boundary'

2017-12-19 11:33:56 -08:00

hash-object.c

sha1_file: convert hash_sha1_file_literally to struct object_id

2017-08-20 21:52:53 -07:00

help.c

Merge branch 'ks/help-alias-label'

2017-09-25 15:24:07 +09:00

index-pack.c

index-pack: use skip_to_optional_arg()

2017-12-11 16:10:12 -08:00

init-db.c

add UNLEAK annotation for reducing leak false positives

2017-09-08 15:43:17 +09:00

interpret-trailers.c

Merge branch 'jk/trailers-parse'

2017-08-26 22:55:04 -07:00

log.c

log: add option to choose which refs to decorate

2017-11-22 13:18:59 +09:00

ls-files.c

Merge branch 'bp/fsmonitor'

2017-11-21 14:07:50 +09:00

ls-remote.c

wildmatch: remove unused wildopts parameter

2017-06-23 18:27:07 -07:00

ls-tree.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

mailinfo.c

…

mailsplit.c

…

merge-base.c

Merge branch 'ma/reduce-heads-leakfix'

2017-11-15 12:14:32 +09:00

merge-file.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

merge-index.c

…

merge-ours.c

Merge branch 'bw/diff-opt-impl-to-bitfields'

2017-11-09 14:31:27 +09:00

merge-recursive.c

…

merge-tree.c

tree-walk: convert fill_tree_descriptor() to object_id

2017-08-14 12:38:54 -07:00

merge.c

merge: add config option for verifySignatures

2017-12-12 10:51:38 -08:00

mktag.c

…

mktree.c

…

mv.c

submodule: convert stage_updated_gitmodules to take a struct index_state

2017-12-12 12:35:20 -08:00

name-rev.c

Merge branch 'mg/timestamp-t-fix' into maint

2017-10-18 14:19:09 +09:00

notes.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

pack-objects.c

Merge branch 'jh/object-filtering'

2017-12-27 11:16:21 -08:00

pack-redundant.c

pack: move pack name-related functions

2017-08-23 15:12:06 -07:00

pack-refs.c

…

patch-id.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

prune-packed.c

Merge branch 'jt/packmigrate'

2017-08-26 22:55:09 -07:00

prune.c

Merge branch 'rd/man-prune-progress'

2017-12-06 09:23:39 -08:00

pull.c

Merge branch 'bc/hash-algo'

2017-12-13 13:28:54 -08:00

push.c

builtin/push.c: add push.pushOption config

2017-10-24 09:57:54 +09:00

read-tree.c

submodule: remove gitmodules_config

2017-08-03 13:11:02 -07:00

rebase--helper.c

rebase -i: learn to abbreviate command names

2017-12-05 10:20:51 -08:00

receive-pack.c

Merge branch 'bw/protocol-v1'

2017-12-06 09:23:44 -08:00

reflog.c

config: add --expiry-date

2017-11-18 12:31:29 +09:00

remote-ext.c

consistently use "fallthrough" comments in switches

2017-09-22 12:49:57 +09:00

remote-fd.c

…

remote.c

Merge branch 'mh/tidy-ref-update-flags'

2017-11-15 12:14:29 +09:00

repack.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

replace.c

refs: convert read_ref and read_ref_full to object_id

2017-10-16 11:05:50 +09:00

rerere.c

avoid "write_in_full(fd, buf, len) != len" pattern

2017-09-14 15:17:59 +09:00

reset.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

rev-list.c

Merge branch 'jh/object-filtering'

2017-12-27 11:16:21 -08:00

rev-parse.c

Merge branch 'mh/packed-ref-store-prep' into maint

2017-10-18 14:18:58 +09:00

revert.c

cherry-pick/revert: reject --rerere-autoupdate when continuing

2017-08-02 15:16:09 -07:00

rm.c

submodule: convert stage_updated_gitmodules to take a struct index_state

2017-12-12 12:35:20 -08:00

send-pack.c

Merge branch 'ma/parse-maybe-bool'

2017-08-22 10:29:03 -07:00

shortlog.c

shortlog: skip format/parse roundtrip for internal traversal

2017-09-09 01:57:03 +09:00

show-branch.c

Merge branch 'ot/pretty'

2017-12-27 11:16:29 -08:00

show-ref.c

refs: convert peel_ref to struct object_id

2017-10-16 11:05:51 +09:00

stripspace.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

submodule--helper.c

Merge branch 'pc/submodule-helper'

2017-12-13 13:28:56 -08:00

symbolic-ref.c

refs: rename constant REF_NODEREF to REF_NO_DEREF

2017-11-06 10:31:08 +09:00

tag.c

Merge branch 'bc/object-id'

2017-11-06 14:24:27 +09:00

unpack-file.c

Merge branch 'jk/write-in-full-fix'

2017-09-25 15:24:06 +09:00

unpack-objects.c

cleanup: fix possible overflow errors in binary search

2017-10-10 08:57:24 +09:00

update-index.c

Merge branch 'bp/fsmonitor'

2017-11-21 14:07:50 +09:00

update-ref.c

refs: rename constant REF_NODEREF to REF_NO_DEREF

2017-11-06 10:31:08 +09:00

update-server-info.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

upload-archive.c

…

var.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

verify-commit.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

verify-pack.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

verify-tag.c

Merge branch 'jk/ref-filter-colors'

2017-08-11 13:26:58 -07:00

worktree.c

Merge branch 'es/worktree-checkout-hook'

2017-12-27 11:16:21 -08:00

write-tree.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00