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

RE: [PATCH] Fix pulling into the same branch.

From
Luck, Tony <tony.luck@intel.com>
Date
Aug 26, 2005, 18:13 UTC
Message-ID
<B8E391BBE9FE384DAA4C5C003888BE6F043BA469@scsmsx401.amr.corp.intel.com>
Show 5 quoted lines
>I am tempted to move this logic to "git fetch" instead, because
>it has the same issue.  Tony's "linus" branch example has been
>updated to do a "git fetch" instead of "git pull" from the
>earlier description in his howto, but if he happens to be on the
>"linus" branch, he would still have this same problem.

I don't spend much time on the linus branch (just to build an updated cscope database, etc.). I never want to check anything in on that branch [sometime I should figure out how use the "hooks" to keep me from shooting myself in the foot here].

>In the meantime, warning the user about the issue and suggesting
>how to do the fast-forwarding of the working tree himself in the
>warning message might be the safest and the most sensible thing
>to do.

Yes please ... a big fat warning with coloured flashing lights and explosions from the sound card.

-Tony
Next: Junio C Hamano
Message 1 of 7 in “RE: [PATCH] Fix pulling into the same branch.”
  1. Luck, TonyAug 26, 2005
  2. Junio C HamanoAug 27, 2005
  3. Johannes SchindelinSep 11, 2005
  4. Junio C HamanoSep 11, 2005
  5. Linus TorvaldsSep 11, 2005
  6. Junio C HamanoSep 11, 2005
  7. Johannes SchindelinSep 11, 2005

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.