From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, santi@agolina.net, Elijah Newren <newren@gmail.com>
Subject: [PATCHv5 0/2] Fix spurious conflicts with pull --rebase
Date: Thu, 12 Aug 2010 19:50:48 -0600 [thread overview]
Message-ID: <1281664250-2703-1-git-send-email-newren@gmail.com> (raw)
Changes since v4
* Added a little bit of detail to the commit log about cases when
the change can affect
* Fixed issue pointed out by Santi with moving 12 lines of code (to
bring definition of oldupstream variable together); the different
pieces had important reasons for being where they were.
Changes since v1
* Changes above, plus other commit log wording changes and lots of
style and formatting issues for the testcase
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 cc85c792 (pull --rebase: be cleverer with rebased upstream
branches, 2008-01-26) and d44e712 (pull: support rebased upstream +
fetch + pull --rebase, 2009-07-19), 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 | 9 ++++++++
t/t5520-pull.sh | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 0 deletions(-)
--
1.7.2.1.43.gbae63
next reply other threads:[~2010-08-13 1:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 1:50 Elijah Newren [this message]
2010-08-13 1:48 ` [PATCHv5 0/2] Fix spurious conflicts with pull --rebase Ævar Arnfjörð Bjarmason
2010-08-13 1:50 ` [PATCHv5 1/2] t5520-pull: Add testcases showing spurious conflicts from git " Elijah Newren
2010-08-13 1:50 ` [PATCHv5 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281664250-2703-1-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).