From: Paul Smith <paul@mad-scientist•net>
To: git@vger•kernel.org
Subject: Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty
Date: Tue, 18 Nov 2014 12:46:28 -0500 [thread overview]
Message-ID: <s934mtwo0zv.fsf@mad-scientist.net> (raw)
In-Reply-To: xmqqy4r9yc5u.fsf@gitster.dls.corp.google.com
Junio C Hamano <gitster@pobox•com> writes:
> Paul Smith <paul@mad-scientist•net> writes:
> No need to resend only to correct the above, even though there may
> be comments on the patch itself from me or others that may make you
> want to reroll this patch, in which case I'd like to see these nits
> gone.
I'll fix in the next iteration.
>> -# don't recreate a workdir over an existing repository
>> -if test -e "$new_workdir"
>> +# make sure the links use full paths
>> +git_dir=$(cd "$git_dir"; pwd)
>
> With this change, the comment gets much harder to understand. "What
> links?" would be the reaction from those who are reading the patch.
I just moved this line; I don't think it had much more context
beforehand, but I'll definitely rewrite the comment to be more clear.
>> + if test $(ls -a1 "$new_workdir/." | wc -l) -ne 2
> I wonder if this check is portable for all platforms we care about,
> but that is OK, as it should be so for the ones I think of and care
> about ;-)
Do you mean "." and ".." representing an empty directory? That will
work on any system where /bin/sh works, for sure.
Or do you mean using "ls" and "wc"? I can easily avoid this.
Recall that new-workdir itself only works on systems that support
symlinks; this limits its portability. For example it doesn't work on
Windows (unfortunately). I spent the better part of a day a few months
ago playing with the various "symlink-ish" capabilities of Windows NTFS
and couldn't find any reliable way to make this work (although I have
virtually no Windows fu).
> The script chdirs around; did you turn $new_workdir into an absolute
> path already, or given a relative $new_workdir this is attempting to
> remove a hierarchy that is different from what you created?
Good point, I'll fix this up
>> +}
>> +siglist="0 1 2 15"
>> +trap cleanup $siglist
>>
>> -# create the workdir
>> -mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
>> +# create embedded directories
>> +for x in logs
>> +do
>> + mkdir -p "$new_workdir/.git/$x" || failed
>> +done
>>
>> # create the links to the original repo. explicitly exclude index, HEAD and
>> # logs/HEAD from the list since they are purely related to the current
>> working
>> # directory, and should not be shared.
>> for x in config refs logs/refs objects info hooks packed-refs remotes
>> rr-cache svn
>> do
>> - case $x in
>> - */*)
>> - mkdir -p "$(dirname "$new_workdir/.git/$x")"
>> - ;;
>> - esac
>
> What's this removal about? If $new_workdir/.git/logs does not
> exist, would "ln -s $there/logs/refs $new_workdir/.git/logs/refs"
> succeed without first creating $new_workdir/.git/logs directory?
I split the creation of the directories from the symlinks: see the new
loop above. This allows us to avoid the icky dirname stuff.
New iteration will follow shortly.
Cheers!
next prev parent reply other threads:[~2014-11-18 19:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-15 17:49 [PATCH] git-new-workdir: Don't fail if the target directory is empty Paul Smith
2014-11-17 17:22 ` Junio C Hamano
2014-11-18 17:46 ` Paul Smith [this message]
2014-11-18 19:32 ` Junio C Hamano
2014-11-18 20:54 ` Paul Smith
2014-11-18 20:58 ` Junio C Hamano
2014-11-18 22:25 ` Paul Smith
2014-11-18 22:51 ` Junio C Hamano
2014-11-19 0:57 ` Paul Smith
-- strict thread matches above, loose matches on Subject: below --
2014-11-18 19:36 Paul Smith
2014-11-18 20:15 ` Junio C Hamano
2014-11-19 17:32 ` Junio C Hamano
2014-11-20 15:41 ` Paul Smith
2014-11-20 15:46 Paul Smith
2014-11-20 17:13 ` Junio C Hamano
2014-11-21 15:08 ` Paul Smith
2014-11-21 17:33 ` Junio C Hamano
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=s934mtwo0zv.fsf@mad-scientist.net \
--to=paul@mad-scientist$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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