Jens Lehmann 0656781fad mv: update the path entry in .gitmodules for moved submodules ... Currently using "git mv" on a submodule moves the submodule's work tree in that of the superproject. But the submodule's path setting in .gitmodules is left untouched, which is now inconsistent with the work tree and makes git commands that rely on the proper path -> name mapping (like status and diff) behave strangely. Let "git mv" help here by not only moving the submodule's work tree but also updating the "submodule.<submodule name>.path" setting from the .gitmodules file and stage both. This doesn't happen when no .gitmodules file is found and only issues a warning when it doesn't have a section for this submodule. This is because the user might just use plain gitlinks without the .gitmodules file or has already updated the path setting by hand before issuing the "git mv" command (in which case the warning reminds him that mv would have done that for him). Only when .gitmodules is found and contains merge conflicts the mv command will fail and tell the user to resolve the conflict before trying again. Also extend the man page to inform the user about this new feature. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2013-08-06 14:10:35 -07:00
..
add.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
annotate.c
apply.c	Merge branch 'tr/maint-apply-non-git-patch-parsefix'	2013-06-26 15:08:09 -07:00
archive.c	pkt-line: provide a LARGE_PACKET_MAX static buffer	2013-02-20 13:42:22 -08:00
bisect--helper.c	i18n: bisect--helper: mark parseopt strings for translation	2012-08-20 12:23:15 -07:00
blame.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
branch.c	branch: colour upstream branches	2013-04-15 11:04:44 -07:00
bundle.c
cat-file.c	cat-file: print tags raw for "cat-file -p"	2013-04-17 14:48:45 -07:00
check-attr.c	Merge branch 'maint'	2012-09-17 15:59:34 -07:00
check-ignore.c	remove match_pathspec() in favor of match_pathspec_depth()	2013-07-15 10:56:09 -07:00
check-ref-format.c
checkout-index.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
checkout.c	convert report_path_error to take struct pathspec	2013-07-15 10:56:08 -07:00
clean.c	convert {read,fill}_directory to take struct pathspec	2013-07-15 10:56:08 -07:00
clone.c	Merge branch 'ms/remote-tracking-branches-in-doc'	2013-07-12 12:04:07 -07:00
column.c	i18n: column: mark parseopt strings for translation	2012-08-20 12:23:16 -07:00
commit-tree.c	commit-tree: document -S option consistently	2013-03-25 15:01:22 -07:00
commit.c	convert common_prefix() to use struct pathspec	2013-07-15 10:56:09 -07:00
config.c	Merge branch 'mm/color-auto-default'	2013-06-20 16:02:33 -07:00
count-objects.c	count-objects: add -H option to humanize sizes	2013-04-10 13:27:26 -07:00
credential.c	git credential fill: output the whole 'struct credential'	2012-06-25 11:56:24 -07:00
describe.c	Merge branch 'mh/reflife'	2013-06-14 08:46:14 -07:00
diff-files.c	convert read_cache_preload() to take struct pathspec	2013-07-15 10:56:08 -07:00
diff-index.c	convert read_cache_preload() to take struct pathspec	2013-07-15 10:56:08 -07:00
diff-tree.c
diff.c	pathspec: support :(literal) syntax for noglob pathspec	2013-07-15 10:56:09 -07:00
fast-export.c	fast-{import,export}: use get_sha1_hex() to read from marks file	2013-05-07 16:20:40 -07:00
fetch-pack.c	Merge branch 'jk/pkt-line-cleanup'	2013-04-01 08:59:37 -07:00
fetch.c	Merge branch 'mh/reflife'	2013-06-14 08:46:14 -07:00
fmt-merge-msg.c	Merge branch 'rt/commentchar-fmt-merge-msg' into maint	2013-04-26 11:10:47 -07:00
for-each-ref.c	Merge branch 'nd/i18n-parseopt-help'	2012-09-07 11:09:09 -07:00
fsck.c	fsck: don't put a void*-shaped peg in a char*-shaped hole	2013-05-28 09:25:01 -07:00
gc.c	silence git gc --auto --quiet output	2012-09-27 17:57:26 -07:00
grep.c	convert {read,fill}_directory to take struct pathspec	2013-07-15 10:56:08 -07:00
hash-object.c	i18n: hash-object: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
help.c	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'	2013-06-26 15:07:48 -07:00
index-pack.c	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
init-db.c	i18n: init-db: mark parseopt strings for translation	2012-08-20 12:23:17 -07:00
log.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
ls-files.c	remove init_pathspec() in favor of parse_pathspec()	2013-07-15 10:56:09 -07:00
ls-remote.c	ls-remote: document the '--get-url' option	2012-09-07 10:58:35 -07:00
ls-tree.c	parse_pathspec: accept :(icase)path syntax	2013-07-15 12:14:38 -07:00
mailinfo.c	Merge branch 'jc/same-encoding' into maint	2012-12-07 14:10:56 -08:00
mailsplit.c	mailsplit: sort maildir filenames more cleverly	2013-03-02 22:52:44 -08:00
merge-base.c	use logical OR (||) instead of binary OR (|) in logical context	2013-06-13 14:47:07 -07:00
merge-file.c	i18n: merge-file: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
merge-index.c	Which merge_file() function do you mean?	2012-12-09 23:05:27 -08:00
merge-ours.c
merge-recursive.c
merge-tree.c	merge-tree: handle directory/empty conflict correctly	2013-05-06 22:17:00 -07:00
merge.c	Merge branch 'ms/remote-tracking-branches-in-doc'	2013-07-12 12:04:07 -07:00
mktag.c
mktree.c	i18n: mktree: mark parseopt strings for translation	2012-08-20 12:23:18 -07:00
mv.c	mv: update the path entry in .gitmodules for moved submodules	2013-08-06 14:10:35 -07:00
name-rev.c	name-rev: allow to specify a subpath for --refs option	2013-06-18 12:02:02 -07:00
notes.c	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'	2013-06-26 15:07:48 -07:00
pack-objects.c	Merge branch 'jk/peel-ref'	2012-10-25 06:42:27 -04:00
pack-redundant.c	Fix sizeof usage in get_permutations	2012-12-13 11:13:44 -08:00
pack-refs.c	pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}	2013-05-01 15:33:11 -07:00
patch-id.c
prune-packed.c	prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()	2013-05-28 09:20:54 -07:00
prune.c	Merge branch 'nd/prune-packed-dryrun-verbose'	2013-06-06 12:17:52 -07:00
push.c	Merge branch 'jk/pull-to-integrate'	2013-07-12 12:04:06 -07:00
read-tree.c	diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const	2013-06-02 15:31:14 -07:00
receive-pack.c	Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint	2013-04-26 11:12:17 -07:00
reflog.c	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
remote-ext.c
remote-fd.c
remote.c	remote: check for superfluous arguments in 'git remote add'	2013-04-24 13:12:51 -07:00
replace.c	fix "builtin-*" references to be "builtin/*"	2013-06-18 11:05:51 -07:00
rerere.c	rerere: convert to use parse_pathspec	2013-07-15 10:56:07 -07:00
reset.c	remove diff_tree_{setup,release}_paths	2013-07-15 10:56:09 -07:00
rev-list.c	pretty: --format output should honor logOutputEncoding	2013-06-26 11:40:31 -07:00
rev-parse.c	rev-parse: add --prefix option	2013-06-17 13:30:01 -07:00
revert.c	cherry-pick/revert: make usage say '<commit-ish>...'	2013-04-24 09:48:01 -07:00
rm.c	rm: do not set a variable twice without intermediate reading.	2013-07-23 11:33:03 -07:00
send-pack.c	teach get_remote_heads to read from a memory buffer	2013-02-24 00:17:38 -08:00
shortlog.c	pretty: --format output should honor logOutputEncoding	2013-06-26 11:40:31 -07:00
show-branch.c	Merge branch 'jc/topo-author-date-sort'	2013-07-01 12:41:23 -07:00
show-ref.c	exclude_existing(): set existing_refs.strdup_strings	2013-06-02 15:28:47 -07:00
stripspace.c	Allow custom "comment char"	2013-01-16 12:48:22 -08:00
symbolic-ref.c	git symbolic-ref --delete $symref	2012-10-21 12:17:38 -07:00
tag.c	Merge branch 'ph/tag-force-no-warn-on-creation' into maint	2013-04-03 09:24:51 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c	convert some get_pathspec() calls to parse_pathspec()	2013-07-15 10:56:06 -07:00
update-ref.c	Use imperative form in help usage to describe an action	2012-08-22 12:02:28 -07:00
update-server-info.c	i18n: update-server-info: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
upload-archive.c	pkt-line: provide a LARGE_PACKET_MAX static buffer	2013-02-20 13:42:22 -08:00
var.c
verify-pack.c	i18n: verify-pack: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00
verify-tag.c	gpg_interface: allow to request status return	2013-02-14 09:30:04 -08:00
write-tree.c	i18n: write-tree: mark parseopt strings for translation	2012-08-22 10:58:29 -07:00