Do not search submodules in deep recursive merge
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 1 replyIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | submodule: Demonstrate known breakage during recursive merget/ | +51 | 0 replies | |
| 2/2 | submodule: Search for merges only at end of recursive mergemerge-recursive.c submodule.c submodule.h +1 more | +11 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/2] Do not search submodules in deep recursive merge
Quoted 9 lines · Junio C Hamano
[Stalled]
* hv/submodule-merge-search (2011-08-26) 5 commits
- submodule: Search for merges only at end of recursive merge
- allow multiple calls to submodule merge search for the same path
- submodule: Demonstrate known breakage during recursive merge
- push: Don't push a repository with unpushed submodules
- push: teach --recurse-submodules the on-demand option (this branch is tangled with fg/submodule-auto-push.)
AFAICT these two topics are tangled due revision traversal interactions. I've untangled the two "submodule:" commits from this stalled topic and rebased on master (34c4461a) resolving one conflict.
The first commit demonstrates a bug: submodule merge search occurs multiple times for the same path during a recursive merge and fails the second time. The second commit fixes it by performing the merge search only at depth 0 recursion. These changes are independent from the actual merge search and revision traversal logic.
Brad
Brad King (2):
submodule: Demonstrate known breakage during recursive merge
submodule: Search for merges only at end of recursive merge
merge-recursive.c | 6 +++- submodule.c | 6 ++++- submodule.h | 2 +- t/t7405-submodule-merge.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.5.4