Ævar Arnfjörð Bjarmason 30884c9afc commit: add support for --fixup <commit> -m"<extra message>" ... Add support for supplying the -m option with --fixup. Doing so has errored out ever since --fixup was introduced. Before this, the only way to amend the fixup message while committing was to use --edit and amend it in the editor. The use-case for this feature is one of: * Leaving a quick note to self when creating a --fixup commit when it's not self-evident why the commit should be squashed without a note into another one. * (Ab)using the --fixup feature to "fix up" commits that have already been pushed to a branch that doesn't allow non-fast-forwards, i.e. just noting "this should have been part of that other commit", and if the history ever got rewritten in the future the two should be combined. In such a case you might want to leave a small message, e.g. "forgot this part, which broke XYZ". With this, --fixup <commit> -m"More" -m"Details" will result in a commit message like: !fixup <subject of <commit>> More Details The reason the test being added here seems to squash "More" at the end of the subject line of the commit being fixed up is because the test code is using "%s%b" so the body immediately follows the subject, it's not a bug in this code, and other tests t7500-commit.sh do the same thing. When the --fixup option was initially added the "Option -m cannot be combined" error was expanded from -c, -C and -F to also include --fixup[1] Those options could also support combining with -m, but given what they do I can't think of a good use-case for doing that, so I have not made the more invasive change of splitting up the logic in commit.c to first act on those, and then on -m options. 1. d71b8ba7c9 ("commit: --fixup option for use with rebase --autosquash", 2010-11-02) Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2017-12-22 13:10:24 -08:00
..
add.c	Merge branch 'tb/add-renormalize'	2017-11-27 11:06:37 +09:00
am.c	Merge branch 'bc/hash-algo'	2017-12-13 13:28:54 -08:00
annotate.c
apply.c	apply: move lockfile into apply_state	2017-10-06 10:07:18 +09:00
archive.c	archive: read local configuration	2016-11-22 13:55:20 -08:00
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 'ma/branch-list-paginate'	2017-11-28 13:41:50 +09:00
bundle.c	bundle: use prefix_filename with bundle path	2017-03-21 11:18:41 -07:00
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'	2017-11-06 14:24:28 +09:00
checkout-index.c	checkout-index: simplify locking logic	2017-10-06 10:07:18 +09:00
checkout.c	Merge branch 'ar/unconfuse-three-dots'	2017-12-19 11:33:58 -08:00
clean.c	Merge branch 'jk/ref-filter-colors-fix'	2017-10-18 10:19:08 +09:00
clone.c	Merge branch 'mh/tidy-ref-update-flags'	2017-11-15 12:14:29 +09: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	commit: add support for --fixup <commit> -m"<extra message>"	2017-12-22 13:10:24 -08: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	credential: handle invalid arguments earlier	2017-05-30 14:45:03 +09:00
describe.c	Merge branch 'bc/object-id'	2017-11-06 14:24:27 +09: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	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
fetch-pack.c	Rename sha1_array to oid_array	2017-03-31 08:33:56 -07:00
fetch.c	Convert check_connected to use struct object_id	2017-10-16 11:05:50 +09:00
fmt-merge-msg.c	Merge branch 'ma/reduce-heads-leakfix'	2017-11-15 12:14:32 +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 '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	cleanup: fix possible overflow errors in binary search	2017-10-10 08:57:24 +09: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	prefix_filename: return newly allocated string	2017-03-21 11:18:41 -07:00
mailsplit.c	mailinfo & mailsplit: check for EOF while parsing	2017-05-08 12:18:19 +09:00
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	Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ	2017-03-26 22:08:21 -07:00
merge-ours.c	Merge branch 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
merge-recursive.c	i18n: merge-recursive: mark verbose message for translation	2016-09-15 13:17:32 -07:00
merge-tree.c	tree-walk: convert fill_tree_descriptor() to object_id	2017-08-14 12:38:54 -07:00
merge.c	Merge branch 'ma/reduce-heads-leakfix'	2017-11-15 12:14:32 +09:00
mktag.c
mktree.c	mktree: plug memory leaks reported by Coverity	2017-05-08 12:18:19 +09:00
mv.c	submodule: remove gitmodules_config	2017-08-03 13:11:02 -07:00
name-rev.c	Merge branch 'mg/timestamp-t-fix' into maint	2017-10-18 14:19:09 +09:00
notes.c	Merge branch 'rd/doc-notes-prune-fix'	2017-12-06 09:23:40 -08:00
pack-objects.c	Merge branch 'rj/no-sign-compare' into maint	2017-10-23 14:20:18 +09:00
pack-redundant.c	pack: move pack name-related functions	2017-08-23 15:12:06 -07:00
pack-refs.c	refs: delete pack_refs() in favor of refs_pack_refs()	2017-04-14 03:53:25 -07:00
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: rearrange fixup/squash lines using the rebase--helper	2017-07-27 15:35:06 -07: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-{ext,fd}: print usage message on invalid arguments	2017-05-30 14:45:04 +09:00
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 'bw/diff-opt-impl-to-bitfields'	2017-11-09 14:31:27 +09:00
rev-list.c	Merge branch 'ma/bisect-leakfix'	2017-11-15 12:14:28 +09: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: remove gitmodules_config	2017-08-03 13:11:02 -07: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 'bc/object-id'	2017-11-06 14:24:27 +09: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	upload-archive: handle "-h" option early	2017-05-30 14:45:04 +09:00
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	add worktree.guessRemote config option	2017-12-06 09:47:35 -08:00
write-tree.c	config: don't include config.h by default	2017-06-15 12:56:22 -07:00