From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
Date: Wed, 26 Jul 2006 12:05:47 -0700 [thread overview]
Message-ID: <7vac6wrxtg.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200607262039.25155.Josef.Weidendorfer@gmx.de> (Josef Weidendorfer's message of "Wed, 26 Jul 2006 20:39:24 +0200")
Josef Weidendorfer <Josef.Weidendorfer@gmx.de> writes:
> On Wednesday 26 July 2006 19:41, Johannes Schindelin wrote:
>>
>> If dir2 already exists, git-mv should move dir1 _into_dir2/.
>> Noticed by Jon Smirl.
>
> Thanks for adding this test.
> BTW, the original PERL script passes it quite fine.
>
> I just looked at Jon's problem. Doesn't seem to be related to
> git-mv or git at all, but more a cogito problem.
> I have some cogito-0.18pre installed, and cg-patch is patching
> the stuff all itself, not using git for this. Pasky?
"git apply" seems to grok this just fine.
> Doing the same with git, i.e. in a rep with existing dir/
>
> mkdir new
> git mv dir new
> git diff --cached -M -C >patch
> git reset --hard
> git apply <patch
>
> However, "git status" shows the "new/" directory totally
> untracked afterwards. Is this expected?
Running "git apply --index <patch" I see the "renamed: " in
there and zzz (or your "new") is tracked.
next prev parent reply other threads:[~2006-07-26 19:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-26 17:41 [PATCH 1/2] t7001: add test for git-mv dir1 dir2/ Johannes Schindelin
2006-07-26 17:50 ` Jon Smirl
2006-07-26 18:23 ` Junio C Hamano
2006-07-26 18:31 ` Jon Smirl
2006-07-26 18:58 ` Junio C Hamano
2006-07-26 19:31 ` Junio C Hamano
2006-07-26 20:33 ` Jon Smirl
2006-07-26 18:47 ` Johannes Schindelin
2006-07-26 18:39 ` Josef Weidendorfer
2006-07-26 19:05 ` Junio C Hamano [this message]
2006-07-28 1:30 ` Petr Baudis
2006-07-28 2:41 ` Junio C Hamano
2006-07-28 2:56 ` Petr Baudis
2006-07-28 4:48 ` Junio C Hamano
2006-07-28 15:47 ` Petr Baudis
2006-07-28 10:14 ` [PATCH] Teach git-apply about '-R' Johannes Schindelin
2006-07-28 15:14 ` Linus Torvalds
2006-07-28 15:46 ` [PATCH v2] " Johannes Schindelin
2006-07-28 15:36 ` [PATCH] " Junio C Hamano
2006-07-28 15:50 ` Johannes Schindelin
2006-07-28 19:20 ` Junio C Hamano
2006-07-28 19:36 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vac6wrxtg.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).