Git rename but GitHub shows it as added file and deleted file

[shirady]

Select Topic Area

Bug

Body

Hi,
The issue in detail:

1. I moved the file into a new directory (I dragged the file to the new directory using VS Code UI).
2. Git recognized this change as a deleted file and a new file, I added both changes before I commit.
3. I run git status, and you can see that the file test_ceph_s3.js was recognized now as renamed
4. I commit and push to the PR - but GitHub shows test_ceph_s3.js as added and deleted file.

Note: this was not the only file that I moved and renamed in this PR, all the other file was recognized as renamed in Git and also in GitHub.
I read here that I should have used git mv (which as you can read above I didn't use...), and maybe it would fix it, but I'm not sure it would work since Git recognized the change of the file as renamed.

Thanks,
Shira

[LuisContrerasGlz]

try using the git mv command to explicitly rename the file, rather than simply moving it in the file system. This will help Git track the file's history more accurately.

[shirady]

Hi @LuisContrerasGlz
Git tracked the file history, it's GitHub that didn't...

[LuisContrerasGlz]

Oh I see sorry about the confusion

[airtower-luna]

Git is very good about detecting when files are renamed, and as you described it did for you. I assume this is simply a limitation of the GitHub UI.

[shirady]

I just wonder what will happen, since it's a shared project, and we use the feature of 'Blame' - in case it detects it as delete and add I'm loosing all the previous changes.

[airtower-luna]

The git blame documentation says this:

The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the -C and -M options.

So it should just work, and if it doesn't it's definitely a bug that the devs should want to fix. 🙂

[spenserblack]

Just curious, were you using Windows when you did this? Git on Windows can automatically convert line endings depending on settings, so perhaps the commit tracks different line endings than the original file had.

[shirady]

Thank you for the detailed examples!
(I would just remove the exclamation mark "!" from the printing, so people could easily copy it).
I thought that maybe squashing the commits would help, but from what I tried on GitHub it still shows it as add/delete file.
Note: I added a link to a temporary repo, and it will be deleted in the future.

[CoolGuyMK]

Hi there,
Did u manage to find any solution?
I'm going through the same situation, I've a big file difference snd git recognizes it as a rename it's just when I push it, it appears as a new/del file on GitHub. I've tried everything possible (rebasing, 2 different commits), everything and it's still not working. Maybe there's a way to increase the diff that is needed to recognize it as a new/del file?

[shirady]

Hi @CoolGuyMK,
I didn't manage to find a solution for it.
Interesting direction, if you'll manage to do it, please update here as well.

[zdenkolini]

can't believe this is still unresolved

[skylupop]

This is a big issue, in my opinion, and since GIT is actually capable to track the file renaming I can't understand why GitHub cannot.

[Fred-AtelierSalvetat]

Hi
I have the same issue:

1. Move files in a commit
   -> Github status was correct
2. Modify files content in a second commit
   -> Commit appears correctly on GitHib
   -> Files Changed" present files as deleted/created.
   -> Line counts is then erroneous hence bad metrics :/

[jabielecki]

Actually, you can go to GH webUI pull request Files tab and render changes from selected commits (shift+click). The diff of a file renders up to a certain threshold of changed lines of text. Over a threshold, the webUI gives up.

1. git mv, content unchanged -> GH shows diff
2. git mv, a few lines of content changed -> GH shows diff
3. git mv, +270/-230 lines changed for a 900 line file -> GH hides diff, but you can still click to show it
4. git mv, more lines than that changed -> GH shows separate create+delete (+900/-900), without a diff

Seen on GitHub Enterprise Server 3.9.4