CODEWITHSUNDEEP
gitversion-controlgit-log
Sean Anderson
Sean Anderson

Reputation: 29311

TortoiseGit log not showing all expected commit messages in some environments

Last week, I merged two git repositories into one, new repository following the steps outlined in this blog. To the best of my knowledge this all went smoothly. All files exist. I am able to find all commits by their SHA.

Now, I am inspecting the log history for a single file using TortoiseGit. I have "follow renames" enabled. When I view the history I do not see any commit messages for any of the branches I transitioned to the new repository, but I do see all commit messages for older branches:

enter image description here

When I run gitk --follow User.cs I am able to see the commit messages as expected:

enter image description here

Steps I've taken to try and solve:

This issue occurs on two of my machines. Both machines were used when merging the two repositories. None of my coworkers experience this issue. They did not use their PCs to assist in merging the repositories.

Question: Is anyone aware of any other caches, settings, or other configuration options I should consider to repair my TortoiseGit instances?

For reference, the steps outlined in the blog are:

# Assume the current directory is where we want the new repository to be created
# Create the new repository
git init

# Before we do a merge, we have to have an initial commit, so we’ll make a dummy commit
dir > deleteme.txt
git add .
git commit -m “Initial dummy commit”

# Add a remote for and fetch the old repo
git remote add -f old_a <OldA repo URL>

# Merge the files from old_a/master into new/master
git merge old_a/master

# Clean up our dummy file because we don’t need it any more
git rm .\deleteme.txt
git commit -m “Clean up initial file”

# Move the old_a repo files and folders into a subdirectory so they don’t collide with the other repo coming later
mkdir old_a
dir –exclude old_a | %{git mv $_.Name old_a}

# Commit the move
git commit -m “Move old_a files into subdir”

# Do the same thing for old_b
git remote add -f old_b <OldB repo URL>
git merge old_b/master
mkdir old_b
dir –exclude old_a,old_b | %{git mv $_.Name old_b}
git commit -m “Move old_b files into subdir”

##########################

# Bring over a feature branch from one of the old repos
git checkout -b feature-in-progress
git merge -s recursive -Xsubtree=old_a old_a/feature-in-progress

Upvotes: 2

Views: 2338

Answers (1)

Marina Liu
Marina Liu

Reputation: 38106

Please try to select All Branches above the refresh button (left-bottom) from the first picture what you shared. And you will find all the branches and commit histories.

Upvotes: 2

Related Questions