git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Add --no-rename to git-apply
Date: Thu, 27 Sep 2007 21:04:18 +0200	[thread overview]
Message-ID: <200709272104.18510.robin.rosenberg@dewire.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0709271107530.28395@racer.site>

torsdag 27 september 2007 skrev Johannes Schindelin:
> Robin said in a follow-up mail that he needs it for a payed-for SCM 
> (let's describe it as TransparentBox here), which insists on explicit 
> renames.
> 
> But I suggest a simple script here which extracts from the diff the 
> renames, which outputs a script which renames the file(s) back and then 
> uses the TransparentBox' mv command:
> 
> sed -n -e "/^rename from/N" \
>   -e "s/^rename from \(.*\)\nrename to \(.*\)/mv \2 \1 \&\& tb mv \1 \2/p" \
>   < diff.patch
> 

I tried something like that (integrated in the script), and the bugger noticed 
it and refused to work as exepected, but now that I think about it should be
possible to fool it. I have to give it a go again and see what really actually
went wrong.

-- robin

  reply	other threads:[~2007-09-27 19:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-26 21:26 [PATCH] Add --no-rename to git-apply Robin Rosenberg
2007-09-26 22:31 ` Robin Rosenberg
2007-09-27  5:12 ` Junio C Hamano
2007-09-27 10:24   ` Johannes Schindelin
2007-09-27 19:04     ` Robin Rosenberg [this message]
2007-09-27 19:12   ` Robin Rosenberg

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=200709272104.18510.robin.rosenberg@dewire.com \
    --to=robin.rosenberg@dewire.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).