git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: phillip.wood123@gmail.com
To: Ondra Medek <xmedeko@gmail.com>, phillip.wood@dunelm.org.uk
Cc: git@vger.kernel.org
Subject: Re: Checkout to different directory at certain commit without changing index
Date: Tue, 14 May 2024 11:07:01 +0100	[thread overview]
Message-ID: <89b83e3d-dd38-4b3b-8f87-6ac739e4e12f@gmail.com> (raw)
In-Reply-To: <CAJsoDaHu1xgfwXHqOGgctQoi5Qb5D1aESeMvaVHaQV0zjyzRRg@mail.gmail.com>

Hi Ondra

On 14/05/2024 07:29, Ondra Medek wrote:
> Hi Phillip,
> 
> your trick with different index file works with git checkout, too, e.g.
> 
> GIT_INDEX_FILE="$destdir"/.git git --work-tree="$destdir" checkout -f
> -q "$commit" -- ./
> rm -f "$destdir"/.git

I'd not thought of that, presumably "git restore" would work as well. 
Using "./" means it will only work from the repository root, you can use 
the pathmagic ":/" instead to checkout everything when it is run from a 
subdirectory  but you need to make sure GIT_INDEX_FILE is an absolute path.

Best Wishes

Phillip

> Sincerely
> Ondra
> 
> On Mon, 13 May 2024 at 19:23, Ondra Medek <xmedeko@gmail.com> wrote:
>>
>> Hi Phillip,
>>
>> besides dependency on tar, I do not want to use git-archive because
>> it's influenced by export-ignore and export-subst attributes, too (as
>> I have mentioned).
>>
>> Thanks for git read-tree, seems it's exactly what I need. Just git
>> read-tree has complained that -u switch needs -m or --reset switches.
>> And I have simplified it to
>>
>> git --work-tree="$destdir" read-tree --index-output="$destdir".git -u
>> --reset "$commit"
>> rm -f "$destdir"/.git
>>
>> May I post this solution to the SO thread I have mentioned?
>>
>> Thanks very much
>>
>> Ondra
>>
>> On Mon, 13 May 2024 at 17:28, Phillip Wood <phillip.wood123@gmail.com> wrote:
>>>
>>> Hi Ondra
>>>
>>> On 13/05/2024 08:26, Ondra Medek wrote:
>>>> Hello,
>>>> I need a simple script for unskilled users to do a fast checkout (LFS
>>>> friendly) of the current local Git clone at a certain commit to a
>>>> different directory I.e. something like "copy at a point in history".
>>>
>>> I think using
>>>
>>>       git archive "$commit" --format=tar |
>>>          { cd "$output_directory" && tar -xf -; }
>>>
>>> is probably the simplest solution. If you don't want to rely on tar then
>>> something like
>>>
>>>       GIT_DIR="$(git rev-parse --path-format=absolute --git-dir)" &&
>>>       GIT_COMMON_DIR="$(git rev-parse --path-format=absolute
>>> --git-common-dir)" || exit
>>>       GIT_INDEX_FILE="$GIT_DIR/tmp-index-$$"
>>>       export GIT_DIR GIT_COMMON_DIR GIT_INDEX_FILE
>>>       unset GIT_WORK_TREE
>>>       mkdir "$output_directory" && cd "$output_directory" &&
>>>       git read-tree -u "$commit"
>>>       status=$?
>>>       rm "$GIT_INDEX_FILE"
>>>       exit $status
>>>
>>> Which uses a temporary index file should work (note I haven't tested
>>> it). You may want to add "--recurse-submodules" and/or
>>> "--no-sparse-checkout" to the "git read-tree" commandline.
>>>
>>> Best Wishes
>>>
>>> Phillip
>>>
>>>> IMO all possible solutions are summarized in this thread
>>>> https://stackoverflow.com/questions/160608/do-a-git-export-like-svn-export
>>>> I describe some of them with my remarks:
>>>>
>>>> - git checkout-index : works with HEAD only.
>>>> - git archive: influenced by export-ignore and export-subst
>>>> attributes, so may not produce exact copy of sources. (And needs tar).
>>>> - git worktree add -d : needs cleanup: git prune or git remove.
>>>> - git clone: Unfortunately, -b param cannot work with commit hash and
>>>> does not respect local worktree settings (e.g. autocrlf). So, a
>>>> solution may be a bit complicated: git clone -s -n . dest/path ; cp
>>>> .git/config dest/path/.git ; cd dest/path ; git co -q <commit-ish> ;
>>>> rm -rf .git
>>>> - git checkout: Unfortunately, modifies Git index, so some action to
>>>> revert index is necessary after: git --work-tree=/path/to/checkout/
>>>> checkout -f -q <tree-ish> -- ./
>>>>
>>>> For me, the best solution is with git clone, because it does not
>>>> modify Git index nor any source working tree settings, so no cleanup
>>>> is necessary. But it's a bit complicated, though. It seems to me that
>>>> "git checkout" could do this better and simpler if it would have some
>>>> param to not modify the Git index. Is it possible to enhance git
>>>> checkout? Or is there any other simple solution not mentioned in the
>>>> SO thread?
>>>>
>>>> Thank you
>>>> Ondra Medek
>>>>

  reply	other threads:[~2024-05-14 10:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13  7:26 Checkout to different directory at certain commit without changing index Ondra Medek
2024-05-13 15:28 ` Phillip Wood
2024-05-13 17:23   ` Ondra Medek
2024-05-14  6:29     ` Ondra Medek
2024-05-14 10:07       ` phillip.wood123 [this message]
2024-05-15  5:07         ` Ondra Medek
2024-05-14 10:01     ` phillip.wood123

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=89b83e3d-dd38-4b3b-8f87-6ac739e4e12f@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=xmedeko@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).