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

Git without morning coffee

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Sep 7, 2011, 07:48 UTC
Message-ID
<4E6721E3.7000207@drmicha.warpmail.net>
Is this my lack of morning coffee, or git's:

git rev-parse origin/next origin/pu 7931f38a2fd882b0f75a4d6f0eb60c3b1b094178 edf014b39ded8ee8a67f2a0cd8d7926b33f3d578 # OK

git checkout origin/next HEAD is now at 7931f38... Merge branch 'master' into next # OK

git log --oneline --no-walk ":/Merge branch 'jk/generation-numbers' into pu" 0ac76f9 Merge branch 'jk/generation-numbers' into pu # Sure it is.

git merge ":/Merge branch 'jk/generation-numbers' into pu" fatal: ':/Merge branch 'jk/generation-numbers' into pu' does not point to a commit # Huh?

git rev-parse ":/Merge branch 'jk/generation-numbers' into pu" 0ac76f96a94a46bce7ec9dcc6c67abcf9d36adac # It does point to a commit!

git merge $(git rev-parse ":/Merge branch 'jk/generation-numbers' into pu") error: addinfo_cache failed for path 't/t7810-grep.sh' Performing inexact rename detection: 100% (91476/91476), done. error: addinfo_cache failed for path 't/t7810-grep.sh' error: addinfo_cache failed for path 'gitweb/static/gitweb.js' error: addinfo_cache failed for path 'gitweb/static/gitweb.css'

## hundreds more

error: addinfo_cache failed for path 't/t7810-grep.sh' error: addinfo_cache failed for path 'gitweb/static/js/blame_incremental.js' Auto-merging cache.h Merge made by the 'recursive' strategy.

Double Huh? Finally, the merge succeeds, despite thy myriad of errors.

I mean, I'm merging a commit from origin/pu to origin/next when the latter is basically contained in the former (except for some merge commits). And what are these addinfo_cache errors?

git --version git version 1.7.7.rc0.328.g9d6c7

which is last week's next with a few additions which I've been carrying along for weeks. Stumped.

Michael
Next: Junio C Hamano
Message 1 of 8 in “Git without morning coffee”
  1. Michael J GruberSep 7, 2011
  2. Junio C HamanoSep 7, 2011
  3. Michael WittenSep 7, 2011
  4. Junio C HamanoSep 7, 2011
  5. Michael WittenSep 7, 2011
  6. Junio C HamanoSep 7, 2011
  7. Re* Git without morning coffeeJunio C Hamano, Sep 7, 2011
  8. Michael J GruberSep 7, 2011

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.