git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git replace woes: dirty stat with clean workdir

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Nov 10, 2009, 16:21 UTC
Message-ID
<4AF992F8.8010309@drmicha.warpmail.net>
Hi there,

when cooking up a "warning example" for git replace (don't draw premature conclusions when there are replaced objects) I came across the following problem: git status seems to compare the work dir with the tree of HEAD, not the replacing tree. Even deleting the index does not help.

[ The example also shows that we need a way to specify --no-replace-objects for gitk. Would easier if gitk really where git something. ]

Michael

#!/bin/sh rm -Rf rtest && mkdir rtest && cd rtest && git init && echo > comment && git add comment && git commit -m "empty comment" && echo nice > "comment" && git commit -am "nice comment" && echo ugly > "comment" && git commit -am "to be discarded" && git replace HEAD^^{tree} HEAD^{tree} && git reset --hard HEAD^ && git log -p && git st

Next: Christian Couder
Message 1 of 2 in “git replace woes: dirty stat with clean workdir”
  1. Michael J GruberNov 10, 2009
  2. Christian CouderNov 10, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.