From: Mark Levedahl <mdl123@verizon•net>
To: git@vger•kernel.org
Cc: git@vger•kernel.org
Subject: Re: [PATCH 0/5] "best effort" checkout
Date: Thu, 29 May 2008 19:24:34 -0400 [thread overview]
Message-ID: <483F3B32.9000907@verizon.net> (raw)
In-Reply-To: <1212020246-26480-1-git-send-email-gitster@pobox.com>
Junio C Hamano wrote:
>
> [PATCH 1/5] "git checkout -- paths..." should error out when paths cannot be written
> [PATCH 2/5] checkout: make reset_clean_to_new() not die by itself
> [PATCH 3/5] checkout: consolidate reset_{to_new,clean_to_new|()
> [PATCH 4/5] unpack_trees(): allow callers to differentiate worktree errors from merge errors
> [PATCH 5/5] checkout: "best effort" checkout
> [PATCH 6/5] NUL hack to create_file()
This works! I've added these patches (pulled from pu) to my tree and rebuilt.
The current results on Cygwin...
git>git checkout -f b71ce7f3f13ebd0e
Previous HEAD position was 952538f... checkout: "best effort" checkout
error: git-checkout-index: unable to create file t/t5100/nul (File exists)
HEAD is now at b71ce7f... Merge 1.5.5.3 in
git>git status
# Not currently on any branch.
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: t/t5100/nul
#
no changes added to commit (use "git add" and/or "git commit -a")
git>git mv t/t5100/nul t/t5100/nul-plain
fatal: renaming t/t5100/nul failed: Invalid argument
git>git rm -f --cached t/t5100/nul
rm 't/t5100/nul'
git>git show HEAD:t/t5100/nul
From nobody Mon Sep 17 00:00:00 2001
---
diff --git a/foo b/foo
^Some strange test^^
^@
So, for posterity, git-mv cannot rename the offending file in the index, but the
file can be removed, and its contents piped into a file of non-offending name,
so a reasonable solution for this case exists.
Many thanks to all, especially to Junio for actually creating the fix.
Mark
next prev parent reply other threads:[~2008-05-29 23:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-29 0:17 [PATCH 0/5] "best effort" checkout Junio C Hamano
2008-05-29 0:17 ` [PATCH 1/5] "git checkout -- paths..." should error out when paths cannot be written Junio C Hamano
2008-05-29 0:17 ` [PATCH 2/5] checkout: make reset_clean_to_new() not die by itself Junio C Hamano
2008-05-29 0:17 ` [PATCH 3/5] checkout: consolidate reset_{to_new,clean_to_new|() Junio C Hamano
2008-05-29 0:17 ` [PATCH 4/5] unpack_trees(): allow callers to differentiate worktree errors from merge errors Junio C Hamano
2008-05-29 0:17 ` [PATCH 5/5] checkout: "best effort" checkout Junio C Hamano
2008-05-29 0:17 ` [PATCH 6/5] NUL hack to create_file() Junio C Hamano
2008-05-29 6:33 ` Johannes Sixt
2008-05-29 7:05 ` Marius Storm-Olsen
2008-05-29 7:23 ` Johannes Sixt
2008-05-29 17:19 ` Daniel Barkalow
2008-05-29 17:51 ` Brian Dessent
2008-05-29 18:35 ` Daniel Barkalow
2008-05-29 12:39 ` Johannes Schindelin
2008-05-29 15:55 ` Daniel Barkalow
2008-05-29 18:26 ` Junio C Hamano
2008-05-29 17:44 ` Alex Riesen
2008-05-29 23:24 ` Mark Levedahl [this message]
2008-05-30 0:33 ` [PATCH 0/5] "best effort" checkout Junio C Hamano
2008-05-30 1:09 ` Mark Levedahl
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=483F3B32.9000907@verizon.net \
--to=mdl123@verizon$(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