On Thu, 16 Nov 2006, Johannes Schindelin wrote:Why? We _do_ have the temporary branch. It's called FETCH_HEAD. Again, why didn't you use FETCH_HEAD? If the user doesn't give us a head to write to, we clearly MUST NOT write to any long-term branch. That would be a _horrible_ mistake. So all your complaints seem totally misplaced. The UI is both usable and practical, and your complaint that git pull doesn't store the fetched branches is just NOT TRUE. And your "solution" is obviously totally unusable. git ABSOLUTELY MUST NOT overwrite any existing branches unless explicitly told to do so by the user. So I really don't see your point. A lot of the complaints seem to not be about the interfaces, but about people not _understanding_ and knowing what the interfaces do. If you were confused about something (like not realizing that FETCH_HEAD is there and very much usable), how about sending in a patch to make FETCH_HEAD use clearer in whatever docs you looked at and didn't find it mentioned in. Now, there is no question that some of the interfaces can get a bit "interesting" to use. For example, if you really don't want to re-fetch for some reason, FETCH_HEAD actually does contain enough information that you should be able to just re-do a failed merge, for example, including the message generation. But at that point it really _does_ get a bit complicated, and you end up doing something like git merge "$(git fmt-merge-msg < .git/FETCH_HEAD)" HEAD FETCH_HEAD which should _work_, but I'm not going to claim that it's all that easy to understand. (That said, read that one-liner a few times, and suddenly it doesn't seem _that_ complicated any more, now does it? You can probably even guess what it's really going to do, even if you don't know git all that well. It's not unreadable line noise, is it?) Of course, if I had a merge that failed (the most common reason being that I had some uncommitted patch in a file that wanted to be updated by the merge), I'd never actually do the above one-liner. I'd just re-do the pull. But if networking was _really_ slow, and I _really_ cared, maybe I'd do the above. (And no, I didn't actually test the above one-liner. Maybe it doesn't work for some reason. Somebody should check, just for fun). Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Kamalesh Babulal | Re: 2.6.23-rc6-mm1 |
| Gabriel C | Re: 2.6.22-rc6-mm1 |
| Linus Torvalds | Linux 2.6.27 |
| Andi Kleen | [PATCH] [9/18] Export prep_compound_page to the hugetlb allocator |
git: | |
| Chris Ortman | [FEATURE REQUEST] git-svn format-patch |
| Francis Moreau | emacs and git... |
| Marco Costalba | [ANNOUNCE] qgit4 aka qgit ported to Windows |
| Johannes Schindelin | Re: git on MacOSX and files with decomposed utf-8 file names |
| Richard Stallman | Real men don't attack straw men |
| Marcos Laufer | dmesg IBM x3650 OpenBSD 4.3 |
| Ted Unangst | Re: About Xen: maybe a reiterative question but .. |
| Richard Storm | MAXDSIZ 1GB memory limit for process |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Steve Glendinning | [PATCH] SMSC LAN911x and LAN921x vendor driver |
| Chas Williams (CONTRACTOR) | Re: [PATCH] firmware: convert Ambassador ATM driver to request_firmware() |
| Marcel Holtmann | Bluetooth fixes for 2.6.27 |
| How to make my PCIE ATA storage device running in Linux | 3 hours ago | Linux general |
| sata/ide timeout errors on asus server-mb | 7 hours ago | Linux kernel |
| Shared swap partition | 7 hours ago | Linux general |
| usb mic not detected | 12 hours ago | Applications and Utilities |
| Problem in Inserting a module | 13 hours ago | Linux kernel |
| Treason Uncloaked | 18 hours ago | Linux kernel |
| high memory | 3 days ago | Linux kernel |
| semaphore access speed | 3 days ago | Applications and Utilities |
| the kernel how to power off the machine | 3 days ago | Linux kernel |
| Easter Eggs in windows XP | 3 days ago | Windows |
