[GIT] Permanently delete specific version / specific commit of the file in git history.

czezz · 09-10-2022, 06:28 PM

Hi everyone,
Im struggling to remove specific revision of one file in GIT history.
I want to remove commit: 7eb5c6bae3cff39f0f1a89faca336ba1ce480316 (first from the bottom).
Is there a way to do that?

Code:

$ git log -- ansible/x/vars/certificates.yml
commit 72dcc68fb842fadef67eb23dea28c36213a14a7c
Author: me
Date:   Fri Sep 9 14:02:08 2022 +0200

commit f052f75edce59ed8b2e3d8fbec08f843edf86ad8
Author: me
Date:   Fri Sep 9 14:00:37 2022 +0200

commit bb097a152b437c82c3a06d1903b4782e30db4425
Author: me
Date:   Fri Sep 9 13:43:15 2022 +0200

commit 25a8877965f2086ed21d6af7a2a0310f035edabc
Author: me
Date:   Fri Sep 9 13:38:04 2022 +0200

commit 7eb5c6bae3cff39f0f1a89faca336ba1ce480316
Author: me
Date:   Thu Sep 1 14:30:12 2022 +0200

Note: I tried to do git rm ansible/x/vars/certificates.yml and then push correct version of the file. That sadly restores its all it's history.

Cheers
czezz

dugan · 09-10-2022, 06:54 PM

"git rebase -i" is one option that came up in my searches ("removing revision from git history").

czezz · 09-11-2022, 03:29 AM

Hi Dugan,
Thanks for reply.
I tried that already but I do not see the file/commit on the list.
Should I maybe add it to the list, eg: drop 7eb5c6 ?
Note: I do want to remove 1 commit of specific file: ansible/x/vars/certificates.yml and nothing else.

Code:

$ git rebase -i 7eb5c6bae3cff39f0f1a89faca336ba1ce480316

pick 04e7b1c monitoring XN
pick 3ce2f20 XN
pick 7f4d85d removing ansible.tar
pick 324fddf X_HOST
pick f242a4f CangeLog
pick 4a4893e ChangeLog # empty
pick 0d4bec0 Make vi behave ;)
pick 77978da query1
pick 1f9e477 query1.sh
pick d896fb0 rm tar
pick fd9d6a5 deployment.yaml edited online with Bitbucket
pick 6b91a6e values_1s.yaml edited online with Bitbucket
pick dc0445c values_2s.yaml edited online with Bitbucket
pick 8a0ee3a values_1p.yaml edited online with Bitbucket
pick b408246 values_2p.yaml edited online with Bitbucket
pick 060fdd6 monitoring
pick 8dc5084 monitoring cronjob
pick f6c5e21 monitoring
pick a0c2fdf Dockerfile update
pick 0cc6d7f customization.sh
pick 25c5811 inst-key
pick 2dc024e cleanup tar file
pick 53c8493 monitoring update
pick 72ce7d3 update
pick c4c940f query
pick 8fc27c6 ha
pick 9acd1e4 template
pick f727141 templates
pick 2528877 del
pick bb297a1 ssl
pick f054f75
pick 72dc468
pick 5a10043 readme
pick 817a35d readme
pick 9220b63 update
pick 3b4599e rm
pick f3158f9 certificates.yml

# Rebase 7eb5c6b..f3158f9 onto 7eb5c6b (37 commands)

pan64 · 09-11-2022, 03:44 AM

just curious. Why on earth do you want to do that? In general git (as any other version control system) will save all the versions of the files. There is no need to alter the history. You ought to create a new commit if you want to change something (you can do a reverse commit too).

Additionally git can be tricky, so we need to know if that commit contains other files too and if you want to revert that change (only for the given file)?

czezz · 09-11-2022, 04:03 AM

To remove sensitive data.
Its there only int that specific commit in that file

It would be still fine to completely remove that file and start over with new one. But doing so the history is restored (see my first post).

boughtonp · 09-11-2022, 07:20 AM

If you need to change a single commit, simply make the relevant changes, stage them as normal, then use "git commit --amend" option to modify the last commit.

If it's not the most recent commit and/or you have more complex needs, see Rewriting History section in the Pro Git book (which covers amending, rebasing and related techniques).

Remember that amending commits and rewriting history is a tool for organizing local repositories - before they are shared with others. If you have already pushed to a shared/public repo, it's safer to treat that sensitive data as compromised.

(There is a --force option which can overwrite when pushing - useful if you have multiple local repositories to deal with, but also capable of deleting unrelated data that you wanted to keep, so you need to fully understand what it does and use with care.)

pan64 · 09-11-2022, 09:52 AM

You need to remove the file completely, after that the history cannot be restored (if deleted properly). But actually you can change only your local repo and other clones will/may still contain that file (as it was mentioned).

ntubski · 09-11-2022, 10:34 AM

Quote:

Originally Posted by czezz

I tried that already but I do not see the file/commit on the list.
Should I maybe add it to the list, eg: drop 7eb5c6 ?
Note: I do want to remove 1 commit of specific file: ansible/x/vars/certificates.yml and nothing else.

Code:

$ git rebase -i 7eb5c6bae3cff39f0f1a89faca336ba1ce480316

I think you need to start the rebase at one commit prior to the one you want to change, e.g., git rebase -i 7eb5c6bae3cff39f0f1a89faca336ba1ce480316~1

pan64 · 09-11-2022, 10:45 AM

Quote:

Originally Posted by ntubski

I think you need to start the rebase at one commit prior to the one you want to change, e.g., git rebase -i 7eb5c6bae3cff39f0f1a89faca336ba1ce480316~1

rebase will not solve this issue if the file is visible/available on several branches. Better to remove the file completely. But again, other clones cannot be easily managed (not to speak about the fact: actually we don't know the number and location of clones).

czezz · 09-11-2022, 03:57 PM

I will try git rebase -i 7eb5c6bae3cff39f0f1a89faca336ba1ce480316~1 tomorrow.
There is only master branch of this repository and there is very small group of people who use it for the moment.

I will also take a look a the link from: Boughtonp
https://www.git-scm.com/book/en/v2/G...riting-History

Additionally, maybe there is a way to completely remove repository and start over?

pan64 · 09-12-2022, 12:16 AM

yes, you can just remove the directory with all the files within and clone again. And you can also clone again into another dir (and keep both the old and new one if you wish).

sundialsvcs · 09-14-2022, 06:09 PM

@czezz: I would cordially recommend that, before you proceed any further with your present quest, that you escalate your plans to your management. As they used to say, "this is probably above your pay grade." (And I mean nothing against you by saying that in public.)

The actions which you now appear to contemplate could potentially have far-reaching implications, even if you actually succeed in doing them. And, you might not be in a position to know what those implications might be. Therefore, other parties must now become involved.

I consider this whole thing to now be an "XY Problem" which appropriately calls for [senior ...] management review before you proceed any further.

Present the issue to your manager: "This is what I think that the problem is. This is why I think we need to do something about it. This is what I propose to do. I await your instructions." Do not expect an immediate response. Do not act until and unless you get one.