eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 13:53:11 +09:00
Code Issues Packages Projects Releases Wiki Activity
git/builtin
History
Nguyễn Thái Ngọc Duy b64335554a merge: remove drop_save() in favor of remove_merge_branch_state() 
Both remove_branch_state() and drop_save() delete almost the same set of
files about the current merge state. The only difference is MERGE_RR but
it should also be cleaned up after a successful merge, which is what
drop_save() is for.

Make a new function that deletes all merge-related state files and use
it instead of drop_save(). This function will also be used in the next
patch that introduces --quit.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-13 11:49:14 +09:00
..
add.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
am.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
annotate.c
…
apply.c
apply.c: make init_apply_state() take a struct repository
2018-08-13 14:14:44 -07:00
archive.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
bisect--helper.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
blame.c
Merge branch 'lt/date-human'
2019-02-06 22:05:24 -08:00
branch.c
Merge branch 'tq/branch-style-fix' into maint
2018-11-21 22:58:06 +09:00
bundle.c
create_bundle(): drop unused "header" parameter
2019-01-24 12:35:44 -08:00
cat-file.c
Merge branch 'jk/loose-object-cache-oid'
2019-02-06 22:05:27 -08:00
check-attr.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
check-ignore.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08: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
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
checkout.c
Merge branch 'nd/checkout-noisy-unmerge'
2019-02-08 20:44:51 -08:00
clean.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
clone.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
column.c
column: fix off-by-one default width
2018-05-13 10:45:05 +09:00
commit-graph.c
commit-graph: rename "large edges" to "extra edges"
2019-01-22 11:33:46 -08:00
commit-tree.c
commit-tree: add missing --gpg-sign flag
2019-01-22 11:08:35 -08:00
commit.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
config.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
count-objects.c
rename "alternate_object_database" to "object_directory"
2018-11-13 14:22:02 +09:00
credential.c
credential: handle invalid arguments earlier
2017-05-30 14:45:03 +09:00
describe.c
Merge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-06 22:05:29 -08:00
diff-files.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
diff.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
difftool.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
fast-export.c
Merge branch 'en/fast-export-import'
2019-01-04 13:33:33 -08:00
fetch-pack.c
Merge branch 'jt/fetch-v2-sideband'
2019-02-05 14:26:11 -08:00
fetch.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
fmt-merge-msg.c
Merge branch 'nd/the-index'
2018-10-19 13:34:02 +09: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 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
gc.c
Merge branch 'js/gc-repack-close-before-remove'
2019-01-18 13:49:57 -08: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 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
hash-object.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
help.c
Merge branch 'rv/alias-help'
2018-10-26 14:22:13 +09:00
index-pack.c
convert has_sha1_file() callers to has_object_file()
2019-01-08 09:41:06 -08:00
init-db.c
Merge branch 'jk/save-getenv-result'
2019-01-29 12:47:54 -08:00
interpret-trailers.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
log.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
ls-files.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
ls-remote.c
Merge branch 'jk/proto-v2-ref-prefix-fix'
2018-11-13 22:37:17 +09:00
ls-tree.c
Merge branch 'nd/attr-pathspec-in-tree-walk'
2019-01-14 15:29:28 -08:00
mailinfo.c
…
mailsplit.c
mailinfo & mailsplit: check for EOF while parsing
2017-05-08 12:18:19 +09:00
merge-base.c
Merge branch 'pk/rebase-in-c-4-opts'
2018-11-02 11:04:55 +09:00
merge-file.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
merge-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
merge-ours.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
merge-recursive.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
merge-tree.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
merge.c
merge: remove drop_save() in favor of remove_merge_branch_state()
2019-05-13 11:49:14 +09:00
mktag.c
object-store: move object access functions to object-store.h
2018-05-16 11:42:03 +09:00
mktree.c
builtin/mktree: remove hard-coded constant
2018-10-15 12:53:15 +09:00
multi-pack-index.c
multi-pack-index: add 'verify' verb
2018-09-17 13:49:38 -07:00
mv.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
name-rev.c
tag: add repository argument to deref_tag
2018-06-29 10:43:39 -07:00
notes.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
pack-objects.c
Merge branch 'sl/const'
2019-02-06 22:05:28 -08:00
pack-redundant.c
various: tighten constness of some local variables
2019-02-04 09:57:10 -08:00
pack-refs.c
refs: add repository argument to get_main_ref_store
2018-04-12 11:38:56 +09:00
patch-id.c
config: don't include config.h by default
2017-06-15 12:56:22 -07:00
prune-packed.c
for_each_*_object: move declarations to object-store.h
2018-08-14 12:29:57 -07:00
prune.c
Merge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14 15:29:31 -08:00
pull.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
push.c
Merge branch 'nd/style-opening-brace'
2019-01-18 13:49:52 -08:00
range-diff.c
Merge branch 'nd/the-index'
2018-10-19 13:34:02 +09:00
read-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rebase--interactive.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
rebase.c
Fix typos in translatable strings for v2.21.0
2019-02-11 12:58:06 -08:00
receive-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
reflog.c
Merge branch 'jk/loose-object-cache-oid'
2019-02-06 22:05:27 -08:00
remote-ext.c
consistently use "fallthrough" comments in switches
2017-09-22 12:49:57 +09:00
remote-fd.c
remote-{ext,fd}: print usage message on invalid arguments
2017-05-30 14:45:04 +09:00
remote.c
Merge branch 'ms/remote-error-message-update'
2018-09-24 10:30:52 -07:00
repack.c
Merge branch 'js/gc-repack-close-before-remove'
2019-01-18 13:49:57 -08:00
replace.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rerere.c
Merge branch 'nd/the-index' into md/list-objects-filter-by-depth
2019-01-15 15:38:29 -08:00
reset.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
rev-list.c
Merge branch 'ds/push-sparse-tree-walk'
2019-02-06 22:05:25 -08:00
rev-parse.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
revert.c
Merge branch 'nd/the-index'
2019-01-04 13:33:33 -08:00
rm.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
send-pack.c
pack-protocol.txt: accept error packets in any context
2019-01-02 13:05:30 -08:00
serve.c
serve: introduce git-serve
2018-03-15 12:01:08 -07:00
shortlog.c
Merge branch 'nd/show-gitcomp-compilation-fix' into maint
2018-12-15 12:24:33 +09:00
show-branch.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
show-index.c
make show-index a builtin
2018-05-29 00:28:22 +09:00
show-ref.c
convert has_sha1_file() callers to has_object_file()
2019-01-08 09:41:06 -08:00
stripspace.c
stripspace: allow -s/-c outside git repository
2018-12-26 15:41:47 -08:00
submodule--helper.c
Merge branch 'nd/the-index-final'
2019-02-06 22:05:23 -08:00
symbolic-ref.c
refs: rename constant REF_NODEREF to REF_NO_DEREF
2017-11-06 10:31:08 +09:00
tag.c
assert NOARG/NONEG behavior of parse-options callbacks
2018-11-06 12:56:29 +09:00
unpack-file.c
object-store: move object access functions to object-store.h
2018-05-16 11:42:03 +09:00
unpack-objects.c
convert "hashcmp() != 0" to "!hasheq()"
2018-08-29 11:32:49 -07:00
update-index.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00
update-ref.c
update-ref: allow --no-deref with --stdin
2018-09-12 15:17:17 -07:00
update-server-info.c
parse-options: let OPT__FORCE take optional flags argument
2018-02-09 10:24:50 -08:00
upload-archive.c
archive: initialize archivers earlier
2018-10-26 10:17:59 +09:00
upload-pack.c
check_replace_refs: rename to read_replace_refs
2018-07-18 15:45:14 -07:00
var.c
config: don't include config.h by default
2017-06-15 12:56:22 -07:00
verify-commit.c
commit: add repository argument to lookup_commit
2018-06-29 10:43:39 -07:00
verify-pack.c
config: don't include config.h by default
2017-06-15 12:56:22 -07:00
verify-tag.c
ref-filter: use "struct object_id" consistently
2018-04-09 06:14:45 +09:00
worktree.c
worktree: allow to (re)move worktrees with uninitialized submodules
2019-01-07 09:26:33 -08:00
write-tree.c
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
2019-01-24 11:55:06 -08:00