Changes since v1 (since v3, only Junio's testcase style issue was fixed):
* Wording changes in the commit log
* Address style and format issues for the testcase, raised by Ævar
Arnfjörð Bjarmason, Junio, and Hannes.
This patch series fixes spurious conflict issues with git pull
--rebase for the case where the upstream repository is *not* rebased.
(There is no change in the case where the upstream repository is
rebased.)
In c85c79279d and d44e71261f, the call to git-rebase was modified in
an effort to reduce the number of commits being reapplied, by trying
to avoid commits that upstream already had or has. It was
specifically designed with an upstream that is rebased in mind.
Unfortunately, it had two side effects for the non-rebased upstream
case: (1) it prevented detecting if "local" patches are already
upstream, and (2) it could in some cases cause more patches known to
be upstream to be reapplied rather than less. This series fixes both
of these issues for the non-rebased upstream case. See the commit
message of the second patch for details.
It's worth noting that issue (1) above also affects the case where the
upstream repository has been rebased, which this patch series does not
address. As far as I can tell, fixing it would require changes
(including new syntax) to format-patch to allow it to be told what
'upstream' is, and some changes to git-pull.sh/git-rebase.sh to pass
it this information.
Elijah Newren (2):
t5520-pull: Add testcases showing spurious conflicts from git pull
--rebase
pull --rebase: Avoid spurious conflicts and reapplying unnecessary
patches
git-pull.sh | 34 +++++++++++++++++++----------
t/t5520-pull.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+), 12 deletions(-)
--
1.7.2.1.43.gbae63
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html