better handle .gitmodules merge conflicts
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest2 patches 4 repliesIn review
- v1 RFC2 patches 3 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | test that git status works with merge conflict in, .gitmodulest/ | +88 | 0 replies | |
| 2/2 | Submodules: Don't parse .gitmodules when it contains, merge conflictssubmodule.c t/ | +32 | 4 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/2] better handle .gitmodules merge conflicts
Am 13.05.2011 08:19, schrieb Junio C Hamano:
Quoted 4 lines
Quoted 1 line · Jens Lehmann
+static int
gitmodules_is_unmerged;Is it too cumbersome to pass this down the callchain as an argument?
I think so. Currently it influences the behavior of fetch, status, the diff family and commit. Having for example gitmodules_config() return that value and then pass it on would touch a lot of code (and that impact would grow even further with the recursive checkout series I'm working on).
So I thought it best to have this information statically in the submodule.c file and let the call sites who need to know that call functions there to get just the information they need and hide the details in submodule.c.
All other issues raised have been addressed in this series.
Heiko Voigt (1):
test that git status works with merge conflict in .gitmodules
Jens Lehmann (1):
Submodules: Don't parse .gitmodules when it contains merge conflicts
submodule.c | 31 +++++++++++++- t/t7506-status-submodule.sh | 92 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 117 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.5.1.291.g080bb