projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 375f8a0) | patch
test that git status works with merge conflict in, .gitmodules
authorHeiko Voigt <hvoigt@hvoigt.net>
Sat, 14 May 2011 16:26:30 +0000 (18:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 May 2011 17:57:51 +0000 (10:57 -0700)
commit44ca0c8ed927c8e7525ceec412704ff9967ff6ac
tree44d1a9e84289aff7a5f150f1e53c8e2c0779de28tree | snapshot
parent375f8a032e9f47d362afd5ea2443f77bcba685cbcommit | diff
test that git status works with merge conflict in, .gitmodules

For example: Two users independently adding a submodule will result in a
merge conflict in .gitmodules. Since configuration of the status and
diff machinery depends on the file being parseable they currently
fail to produce useable output in case .gitmodules is marked with a
merge conflict.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7506-status-submodule.sh diff | blob | history
Git—the stupid content tracker