From: Pete Wyckoff <pw@padd•com>
To: Jonathan Nieder <jrnieder@gmail•com>
Cc: git@vger•kernel.org, Christian Couder <chriscool@tuxfamily•org>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] cherry-pick/revert: transparently refresh index
Date: Sun, 31 Oct 2010 18:26:44 -0400 [thread overview]
Message-ID: <20101031222644.GA31257@arf.padd.com> (raw)
In-Reply-To: <20101031195933.GA21240@burratino>
jrnieder@gmail•com wrote on Sun, 31 Oct 2010 14:59 -0500:
> A stat-dirty index is not a detail that ought to concern the operator
> of porcelain such as "git cherry-pick".
>
> Without this change, a cherry-pick after copying a worktree with rsync
> errors out with a misleading message.
>
> $ git cherry-pick build/top
> error: Your local changes to 'file.h' would be overwritten by merge. Aborting.
> Please, commit your changes or stash them before you can merge.
>
> Noticed-by: Pete Wyckoff <pw@padd•com>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail•com>
Thanks, this works well. I tested it and am happy with the
change. It is needed for correctness.
Since I know that I just copied the repo, I'd prefer not to
make people wait to refresh the index. A new flag to
update-index improves performance by avoiding the initial
re-read of all files in the repository. Patch follows in
next mail.
-- Pete
next prev parent reply other threads:[~2010-10-31 22:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-31 17:44 index rebuild for cloned repo Pete Wyckoff
2010-10-31 18:07 ` Jonathan Nieder
2010-10-31 19:59 ` [PATCH] cherry-pick/revert: transparently refresh index Jonathan Nieder
2010-10-31 20:26 ` Andreas Schwab
2010-10-31 20:32 ` Jonathan Nieder
2010-10-31 22:26 ` Pete Wyckoff [this message]
2010-10-31 22:28 ` [PATCH] teach update-index --refresh about --data-unchanged Pete Wyckoff
2010-11-03 17:37 ` Junio C Hamano
2010-11-03 18:36 ` Jonathan Nieder
2010-11-03 22:02 ` Pete Wyckoff
2010-11-14 16:58 ` Pete Wyckoff
2010-11-14 17:34 ` Jonathan Nieder
2010-11-01 8:09 ` [PATCH] cherry-pick/revert: transparently refresh index Johannes Sixt
2010-11-03 17:30 ` Junio C Hamano
2010-11-03 20:33 ` Johannes Sixt
2010-11-01 8:44 ` Nguyen Thai Ngoc Duy
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=20101031222644.GA31257@arf.padd.com \
--to=pw@padd$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
/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