From: Wesley Schwengle <wesley@schwengle.net>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org
Subject: Re: Possible git bug
Date: Thu, 16 Sep 2021 08:07:33 -0400 [thread overview]
Message-ID: <c7949156-a7e5-085f-4779-82d0538a4d72@schwengle.net> (raw)
In-Reply-To: <YULYG970Ltnbshdn@nand.local>
On 9/16/21 1:37 AM, Taylor Blau wrote:
> FWIW, I had to tweak this script a little, since file.txt is untracked
> before it is added initially. (So a "git add file.txt" before this first
> commit is required.)
Oh sorry! I overlooked that part.
> But even after this, I got exactly what I expected from this script
> (which was that your "foo" branch had three commits before and after).
> Is there something else interesting going on with your setup that might
> explain why I can't reproduce this?
Oh, I found it.. Replace `git rebase master' with `git rebase' in the
reproduction path.
Disregard my post, it seems this is documented behavior in the rebase
man-page. When you have an upstream configured and you don't specify it
on the command line, --fork-point is used, while if you specify the
upstream --no-fork-point is used. `git rebase master --fork-point'
exhibits the same as I was seeing. Although I'm now completely confused
by this behavior. It doesn't make sense to me.
This happens:
We are on a branch, we merge it into another branch.
We undo the merge because reasons.
Now we git rebase, without the upstream, because we've set it.
Fork-point is used now, because we haven't specified an upstream, but we
did set it and git merge-base decides, oh, we had those commits in
master but these where dropped so we drop them in this branch as well.
New question, is there a way to tell rebase to NOT use fork-point via
git-config in this situation?
Cheers,
Wesley
--
Wesley Schwengle
E: wesley@schwengle.net
next prev parent reply other threads:[~2021-09-16 12:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 3:29 Possible git bug Wesley Schwengle
2021-09-16 5:37 ` Taylor Blau
2021-09-16 12:07 ` Wesley Schwengle [this message]
2021-09-16 12:47 ` wesley
2021-09-16 12:47 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-16 15:43 ` Junio C Hamano
2021-09-16 21:21 ` Junio C Hamano
2021-09-16 22:35 ` Possible git bug wesley
2021-09-16 22:35 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-16 22:47 ` Junio C Hamano
2021-09-16 22:50 ` Wesley Schwengle
2021-09-16 22:53 ` Junio C Hamano
2021-09-20 14:34 ` Wesley Schwengle
2021-09-16 22:46 ` Possible git bug wesley
2021-09-16 22:46 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-20 16:07 ` Junio C Hamano
2021-09-16 15:33 ` Possible git bug Junio C Hamano
2021-09-16 19:39 ` Wesley Schwengle
2021-09-16 21:52 ` Junio C Hamano
2021-09-16 22:30 ` Wesley Schwengle
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 4:50 Hugh Davenport
2013-08-14 5:42 ` Daniel Knittl-Frank
2013-08-14 6:53 ` Jeff King
2009-01-17 13:52 Damon LaCrosse
2009-01-17 15:16 ` Johannes Schindelin
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=c7949156-a7e5-085f-4779-82d0538a4d72@schwengle.net \
--to=wesley@schwengle.net \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
/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).