Philippe Blain 37ce97353c builtin/am: allow disabling conflict advice ... When 'git am' or 'git rebase --apply' encounter a conflict, they show a message instructing the user how to continue the operation. This message can't be disabled. Use ADVICE_MERGE_CONFLICT introduced in the previous commit to allow disabling it. Update the tests accordingly, as the advice output is now on stderr instead of stdout. In t4150, redirect stdout to 'out' and stderr to 'err', since this is less confusing. In t4254, as we are testing a specific failure mode of 'git am', simply disable the advice. Note that we are not testing that this advice is shown in 'git rebase' for the apply backend since 2ac0d6273f (rebase: change the default backend from "am" to "merge", 2020-02-15). Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2024-03-18 09:28:42 -07:00
..
add.c	Merge branch 'eg/add-uflags'	2024-03-07 15:59:41 -08:00
am.c	builtin/am: allow disabling conflict advice	2024-03-18 09:28:42 -07:00
annotate.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
apply.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
archive.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:33 -08:00
bisect.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
blame.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
branch.c	Merge branch 'kh/branch-ref-syntax-advice'	2024-03-15 16:05:59 -07:00
bugreport.c	bugreport: reject positional arguments	2023-10-29 08:56:17 +09:00
bundle.c	Merge branch 'rs/bundle-parseopt-cleanup'	2023-08-07 11:57:18 -07:00
cat-file.c	Merge branch 'js/check-null-from-read-object-file'	2024-02-14 15:36:06 -08:00
check-attr.c	check-attr: integrate with sparse-index	2023-08-11 09:44:52 -07:00
check-ignore.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
check-mailmap.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
check-ref-format.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
checkout--worker.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
checkout-index.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
checkout.c	Merge branch 'js/merge-tree-3-trees'	2024-03-07 15:59:41 -08:00
clean.c	clean: further clean-up of implementation around "--force"	2024-03-04 14:05:13 -08:00
clone.c	Merge branch 'as/option-names-in-messages'	2024-03-15 16:05:59 -07:00
column.c	column: disallow negative padding	2024-02-13 10:18:50 -08:00
commit-graph.c	Merge branch 'ja/doc-placeholders-fix'	2024-02-08 13:20:34 -08:00
commit-tree.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
commit.c	Merge branch 'jt/commit-redundant-scissors-fix'	2024-03-07 15:59:41 -08:00
config.c	config: add back code comment	2024-01-29 10:27:53 -08:00
count-objects.c	count-objects: mark unused parameter in alternates callback	2023-07-13 17:24:00 -07:00
credential-cache--daemon.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
credential-cache.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
credential-store.c	Merge branch 'cw/strbuf-cleanup'	2023-07-06 11:54:46 -07:00
credential.c	builtins: mark unused prefix parameters	2023-03-28 14:11:24 -07:00
describe.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
diagnose.c	object-file.h: move declarations for object-file.c functions from cache.h	2023-04-11 08:52:10 -07:00
diff-files.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
diff-index.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
diff-tree.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
diff.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
difftool.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
fast-export.c	use xstrncmpz()	2024-02-12 09:32:41 -08:00
fast-import.c	commit-reach(repo_in_merge_bases_many): report missing commits	2024-02-28 09:47:03 -08:00
fetch-pack.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
fetch.c	Merge branch 'js/merge-base-with-missing-commit'	2024-03-11 14:12:30 -07:00
fmt-merge-msg.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
for-each-ref.c	for-each-ref: add new option to include root refs	2024-02-23 10:36:28 -08:00
for-each-repo.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
fsck.c	refs: drop unused params from the reflog iterator callback	2024-02-21 09:58:06 -08:00
fsmonitor--daemon.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:33 -08:00
gc.c	maintenance: use XDG config if it exists	2024-01-18 12:17:42 -08:00
get-tar-commit-id.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
grep.c	Merge branch 'js/check-null-from-read-object-file'	2024-02-14 15:36:06 -08:00
hash-object.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
help.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
hook.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
index-pack.c	unpack: replace xwrite() loop with write_in_full()	2024-03-02 11:12:16 -08:00
init-db.c	Merge branch 'ps/refstorage-extension'	2024-01-16 10:11:57 -08:00
interpret-trailers.c	format_trailers(): use strbuf instead of FILE	2024-03-01 10:35:42 -08:00
log.c	commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors	2024-02-29 08:06:01 -08:00
ls-files.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
ls-remote.c	Merge branch 'en/header-cleanup'	2024-01-08 14:05:15 -08:00
ls-tree.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
mailinfo.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
mailsplit.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
merge-base.c	commit-reach(repo_get_merge_bases_many_dirty): pass on errors	2024-02-29 08:06:01 -08:00
merge-file.c	merge-file: add --diff-algorithm option	2023-11-22 14:23:06 +09:00
merge-index.c	read-cache*.h: move declarations for read-cache.c functions from cache.h	2023-06-21 13:39:53 -07:00
merge-ours.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
merge-recursive.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
merge-tree.c	Merge branch 'js/merge-base-with-missing-commit'	2024-03-11 14:12:30 -07:00
merge.c	Merge branch 'js/merge-base-with-missing-commit'	2024-03-11 14:12:30 -07:00
mktag.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:33 -08:00
mktree.c	git-compat-util: move alloc macros to git-compat-util.h	2023-07-05 11:42:31 -07:00
multi-pack-index.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
mv.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
name-rev.c	name-rev: use mem_pool_strfmt()	2024-02-26 09:35:40 -08:00
notes.c	Merge branch 'js/check-null-from-read-object-file'	2024-02-14 15:36:06 -08:00
pack-objects.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
pack-redundant.c	object-store-ll.h: split this header out of object-store.h	2023-06-21 13:39:54 -07:00
pack-refs.c	pack-refs: teach pack-refs --include option	2023-05-12 14:54:14 -07:00
patch-id.c	Merge branch 'gc/config-context'	2023-07-06 11:54:48 -07:00
prune-packed.c	treewide: be explicit about dependence on gettext.h	2023-03-21 10:56:51 -07:00
prune.c	Merge branch 'en/header-split-cache-h-part-3'	2023-06-29 16:43:21 -07:00
pull.c	commit-reach(get_octopus_merge_bases): pass on "missing commits" errors	2024-02-29 08:06:01 -08:00
push.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
range-diff.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
read-tree.c	Merge branch 'js/merge-tree-3-trees'	2024-03-07 15:59:41 -08:00
rebase.c	Merge branch 'js/merge-base-with-missing-commit'	2024-03-11 14:12:30 -07:00
receive-pack.c	commit-reach(repo_in_merge_bases_many): report missing commits	2024-02-28 09:47:03 -08:00
reflog.c	Merge branch 'ps/reflog-list' into HEAD	2024-03-01 14:38:55 -08:00
remote-ext.c	builtins: annotate always-empty prefix parameters	2023-03-28 14:11:24 -07:00
remote-fd.c	builtins: annotate always-empty prefix parameters	2023-03-28 14:11:24 -07:00
remote.c	builtin/remote.c: trivial fix of error message	2024-03-05 14:11:56 -08:00
repack.c	repack: check error writing to pack-objects subprocess	2024-03-02 11:12:16 -08:00
replace.c	replace: mark unused parameter in each_mergetag_fn callback	2023-07-13 17:24:00 -07:00
replay.c	replay: stop assuming replayed branches do not diverge	2023-11-26 10:10:50 +09:00
rerere.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
reset.c	Merge branch 'js/merge-tree-3-trees'	2024-03-07 15:59:41 -08:00
rev-list.c	rev-list: allow missing tips with --missing=[print|allow*]	2024-02-14 09:39:14 -08:00
rev-parse.c	commit-reach(repo_get_merge_bases): pass on "missing commits" errors	2024-02-29 08:06:01 -08:00
revert.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
rm.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
send-pack.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
shortlog.c	diff.h: remove unnecessary include of oidset.h	2023-06-21 13:39:53 -07:00
show-branch.c	Merge branch 'jc/parse-options-show-branch'	2023-07-27 15:26:37 -07:00
show-index.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
show-ref.c	Merge branch 'tc/show-ref-exists-fix' into maint-2.43	2024-02-13 14:44:47 -08:00
sparse-checkout.c	Merge branch 'en/header-cleanup' into maint-2.43	2024-02-08 16:22:10 -08:00
stash.c	Merge branch 'ps/report-failure-from-git-stash' into maint-2.43	2024-02-13 14:44:49 -08:00
stripspace.c	Merge branch 'cw/strbuf-cleanup'	2023-07-06 11:54:46 -07:00
submodule--helper.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
symbolic-ref.c	git-compat-util: move strbuf.c funcs to its header	2023-07-05 11:41:18 -07:00
tag.c	Merge branch 'rj/tag-column-fix'	2024-02-27 16:04:32 -08:00
unpack-file.c	treewide: remove unnecessary includes for wrapper.h	2023-07-05 11:41:59 -07:00
unpack-objects.c	unpack: replace xwrite() loop with write_in_full()	2024-03-02 11:12:16 -08:00
update-index.c	Merge branch 'jc/unresolve-removal'	2023-10-02 11:20:00 -07:00
update-ref.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
update-server-info.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00
upload-archive.c	repository: remove unnecessary include of path.h	2023-06-21 13:39:53 -07:00
upload-pack.c	upload-pack: always turn off save_commit_buffer	2024-02-28 14:42:01 -08:00
var.c	config: rename global config function	2024-01-18 12:17:41 -08:00
verify-commit.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
verify-pack.c	builtin.h: remove unneccessary includes	2023-06-21 13:39:54 -07:00
verify-tag.c	treewide: remove unnecessary includes in source files	2023-12-26 12:04:31 -08:00
worktree.c	Merge branch 'jc/comment-style-fixes' into maint-2.43	2024-02-13 14:44:48 -08:00
write-tree.c	cache.h: remove this no-longer-used header	2023-06-21 13:39:53 -07:00