How to determine the parent branch for rebase

Question

Yes, it looks like " Find the parent branch of the git branch , but I did not find my answer there.

I think I want to know how to find my current parent branch, but I could ask the wrong question. Therefore, I will talk about my scenario.

• There are several long release branches in our organization that are not renamed (but are eventually outdated after release)

• Sometimes I create a function branch from one of the release branches to work on a problem. This is a local branch of functions.

• They called me to work on another, different release, etc.

• I am returning to this function, and now I want to reinstall it until the last commit, from which it was originally forked. But enough time has passed that I can’t remember whether it was forked with release x or released y

So how do I do this? In my opinion, it seemed to me that I would just find out which release branch I created my function for, and then redirect to the last commit on this branch.

I know that there are other organizational methods that can be done to avoid this problem, for example, always include the name of the base branch in my function branch. But the ship sailed.

Is there a solution gitfor the problem I have?

Answer 1

This should do it for you:

git log --oneline \
  | cut -f 1 -d' ' \
  | (while read commit ; do
       other_branches="$(git branch --contains $commit | egrep -v '^\* ')"
       if [ -n "${other_branches}" ] ; then
         echo -e "${commit} is in:\n${other_branches}"
         break
       fi
     done)

, , ( ), . , , , , , commit, .

Answer 2

, , .

• . , , , unix:

  git show-branch | sed "s/].*//" | grep "\*" | \
      grep -v "$(git rev-parse --abbrev-ref HEAD)" | \
      head -n1 | sed "s/^.*\[//"
  

  @droidbot, @gaal.

• @ladiko, @mark-reed answer:

  git show-branch -a | awk -F'[]^~[]' '/^\*/ && !/'"$(git rev-parse --abbrev-ref HEAD)"'/ {print $2;exit}'
  

, , , .