# Binary files in a linear repository 8 messages from 2009-11-02 to 2009-11-02. Participants: Markus Hitter, Björn Steinbrink, Dmitry Potapov. Thread: https://gitlist.dev/t/21455 ## Markus Hitter, 2009-11-02 15:08 Subject: Binary files in a linear repository Message-ID: <8470D32E-2CAA-4E3F-8BA0-B4578372A3C4@jump-ing.de> URL: https://gitlist.dev/e/8470D32E-2CAA-4E3F-8BA0-B4578372A3C4%40jump-ing.de In-Reply-To: ``` Hello all, currently I'm planning a frontend tool which makes use of only a small subset of git. The repo's contents is all binary (think of pictures). Accordingly, I can't merge in a meaningful way, making branches of very limited use. The situation I'm trying to solve is: - A revision earlier than the latest one is checked out. - Files of this earlier commit are modified. - I want to record this earlier commit along with it's modifications as a new commit on top of master, ignoring intermediate commits: com005 <-- master com004 com003 <-- HEAD, files modified com002 com001 (initial commit) One solution to do this is to move all files somewhere else, check out master, deleting all checked out files, placing the moved away files back into place and committing the result as com006. Obviously, this is a pretty complex operation, just waiting to exploit coding mistakes. Additionally, this will be slow. Now I'm thinking about a much simpler solution: Simply declare the current set of files as (a modified) master/com005 and commit them. A "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do it. Now my question: Is it safe to tweak the files in $GIT_DIR this way or will this corrupt the repository? Thanks for any opinions, Markus ``` ## Björn Steinbrink, 2009-11-02 15:34 Subject: Re: Binary files in a linear repository Message-ID: <20091102153428.GA4778@atjola.homenet> URL: https://gitlist.dev/e/20091102153428.GA4778%40atjola.homenet In-Reply-To: <8470D32E-2CAA-4E3F-8BA0-B4578372A3C4@jump-ing.de> ``` On 2009.11.02 16:08:25 +0100, Markus Hitter wrote: > The situation I'm trying to solve is: > > - A revision earlier than the latest one is checked out. > > - Files of this earlier commit are modified. > > - I want to record this earlier commit along with it's modifications > as a new commit on top of master, ignoring intermediate commits: > > com005 <-- master > com004 > com003 <-- HEAD, files modified > com002 > com001 (initial commit) > > One solution to do this is to move all files somewhere else, check > out master, deleting all checked out files, placing the moved away > files back into place and committing the result as com006. > Obviously, this is a pretty complex operation, just waiting to > exploit coding mistakes. Additionally, this will be slow. Instead of doing "git checkout com003", which detaches HEAD, you could do: git read-tree -u --reset com003 Which will update the index and working tree to reflect the contents of com003. The modify stuff, add, commit, done. > Now I'm thinking about a much simpler solution: Simply declare the > current set of files as (a modified) master/com005 and commit them. > A "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do > it. > > Now my question: Is it safe to tweak the files in $GIT_DIR this way > or will this corrupt the repository? Ignoring that $GIT_DIR/master is the wrong path, that 'cp' would (at best) act like detaching HEAD. Björn ``` ## Dmitry Potapov, 2009-11-02 15:48 Subject: Re: Binary files in a linear repository Message-ID: <20091102154831.GC27126@dpotapov.dyndns.org> URL: https://gitlist.dev/e/20091102154831.GC27126%40dpotapov.dyndns.org In-Reply-To: <8470D32E-2CAA-4E3F-8BA0-B4578372A3C4@jump-ing.de> ``` On Mon, Nov 02, 2009 at 04:08:25PM +0100, Markus Hitter wrote: > > Now I'm thinking about a much simpler solution: Simply declare the > current set of files as (a modified) master/com005 and commit them. A > "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do it. > > Now my question: Is it safe to tweak the files in $GIT_DIR this way or > will this corrupt the repository? You probably should use 'git update-ref' if you want to change HEAD manually. But it seems to me that you do not need even that. All what you need is: $ git reset --soft master and then commit your changes (git reset --soft does not touch the index file nor the working tree at all). Dmitry ``` ## Björn Steinbrink, 2009-11-02 16:09 Subject: Re: Binary files in a linear repository Message-ID: <20091102160903.GA6197@atjola.homenet> URL: https://gitlist.dev/e/20091102160903.GA6197%40atjola.homenet In-Reply-To: <20091102154831.GC27126@dpotapov.dyndns.org> ``` On 2009.11.02 18:48:31 +0300, Dmitry Potapov wrote: > On Mon, Nov 02, 2009 at 04:08:25PM +0100, Markus Hitter wrote: > > > > Now I'm thinking about a much simpler solution: Simply declare the > > current set of files as (a modified) master/com005 and commit them. A > > "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do it. > > > > Now my question: Is it safe to tweak the files in $GIT_DIR this way or > > will this corrupt the repository? > > You probably should use 'git update-ref' if you want to change HEAD > manually. But it seems to me that you do not need even that. All what > you need is: > > $ git reset --soft master > > and then commit your changes (git reset --soft does not touch the index > file nor the working tree at all). But then you still have to do: git checkout master git merge HEAD@{1} To actually update the "master" branch head. The reset doesn't re-attach HEAD. Björn ``` ## Dmitry Potapov, 2009-11-02 16:52 Subject: Re: Binary files in a linear repository Message-ID: <20091102165215.GD27126@dpotapov.dyndns.org> URL: https://gitlist.dev/e/20091102165215.GD27126%40dpotapov.dyndns.org In-Reply-To: <20091102160903.GA6197@atjola.homenet> ``` On Mon, Nov 02, 2009 at 05:09:03PM +0100, Björn Steinbrink wrote: > On 2009.11.02 18:48:31 +0300, Dmitry Potapov wrote: > > On Mon, Nov 02, 2009 at 04:08:25PM +0100, Markus Hitter wrote: > > > > > > Now I'm thinking about a much simpler solution: Simply declare the > > > current set of files as (a modified) master/com005 and commit them. A > > > "cp $GIT_DIR/master $GIT_DIR/HEAD" followed by a commit would do it. > > > > > > Now my question: Is it safe to tweak the files in $GIT_DIR this way or > > > will this corrupt the repository? > > > > You probably should use 'git update-ref' if you want to change HEAD > > manually. But it seems to me that you do not need even that. All what > > you need is: > > > > $ git reset --soft master > > > > and then commit your changes (git reset --soft does not touch the index > > file nor the working tree at all). > > But then you still have to do: > git checkout master > git merge HEAD@{1} > > To actually update the "master" branch head. The reset doesn't re-attach > HEAD. You are right... I forgot about that somehow. So, it should be $ git reset --soft master $ git checkout master and only then $ git commit Dmitry ``` ## Björn Steinbrink, 2009-11-02 17:01 Subject: Re: Binary files in a linear repository Message-ID: <20091102170106.GA8650@atjola.homenet> URL: https://gitlist.dev/e/20091102170106.GA8650%40atjola.homenet In-Reply-To: <20091102165215.GD27126@dpotapov.dyndns.org> ``` On 2009.11.02 19:52:15 +0300, Dmitry Potapov wrote: > On Mon, Nov 02, 2009 at 05:09:03PM +0100, Björn Steinbrink wrote: > > On 2009.11.02 18:48:31 +0300, Dmitry Potapov wrote: > > > On Mon, Nov 02, 2009 at 04:08:25PM +0100, Markus Hitter wrote: > > > You probably should use 'git update-ref' if you want to change HEAD > > > manually. But it seems to me that you do not need even that. All what > > > you need is: > > > > > > $ git reset --soft master > > > > > > and then commit your changes (git reset --soft does not touch the index > > > file nor the working tree at all). > > > > But then you still have to do: > > git checkout master > > git merge HEAD@{1} > > > > To actually update the "master" branch head. The reset doesn't re-attach > > HEAD. > > You are right... I forgot about that somehow. So, it should be > > $ git reset --soft master > $ git checkout master > > and only then > > $ git commit That would do, but: git checkout *make changes* git reset --soft master git checkout master git commit seems unnecessarily complicated, when you could as well do: git read-tree -u --reset *make changes* git commit Björn ``` ## Dmitry Potapov, 2009-11-02 17:45 Subject: Re: Binary files in a linear repository Message-ID: <20091102174546.GE27126@dpotapov.dyndns.org> URL: https://gitlist.dev/e/20091102174546.GE27126%40dpotapov.dyndns.org In-Reply-To: <20091102170106.GA8650@atjola.homenet> ``` On Mon, Nov 02, 2009 at 06:01:06PM +0100, Björn Steinbrink wrote: > > That would do, but: > git checkout > *make changes* > git reset --soft master > git checkout master > git commit > > seems unnecessarily complicated, when you could as well do: > git read-tree -u --reset > *make changes* > git commit I thought Markus *already* had made changes on that commit, but maybe I misread what he wrote... Dmitry ``` ## Björn Steinbrink, 2009-11-02 18:37 Subject: Re: Binary files in a linear repository Message-ID: <20091102183740.GA9900@atjola.homenet> URL: https://gitlist.dev/e/20091102183740.GA9900%40atjola.homenet In-Reply-To: <20091102174546.GE27126@dpotapov.dyndns.org> ``` On 2009.11.02 20:45:46 +0300, Dmitry Potapov wrote: > I thought Markus *already* had made changes on that commit, but > maybe I misread what he wrote... Hm, I understood that the described scenario is one he wants to implement in his front-end, and that he was asking for advice how to do it. I guess only Martin can tell for sure, so let's see :-) Björn ```