Revision bc318ea86d3ecd4074ecde3122b1e65f84cf9996 authored by Shawn O. Pearce on 25 July 2007, 09:02:38 UTC, committed by Shawn O. Pearce on 25 July 2007, 09:02:38 UTC
If we are being asked to merge a tracking branch that comes from a remote repository accessed by the very common SSH URL format of "user@host:/path/to/repo" then we really don't need the username as part of the merge message, it only clutters up the history and makes things more confusing. So we instead clip the username part off if the local filesystem path is absolute, as its probably not going to be an ambiguous URL even when it is missing the username. On the other hand we cannot clip the username off if the URL is not absolute, because in such cases (e.g. "user@host:myrepo") the directory that the repository path is resolved in is relative to the user's home directory, and the username becomes important. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 parent ead49f5
| File | Mode | Size |
|---|---|---|
| lib | ||
| .gitignore | -rw-r--r-- | 62 bytes |
| GIT-VERSION-GEN | -rwxr-xr-x | 1.8 KB |
| Makefile | -rw-r--r-- | 4.6 KB |
| git-gui.sh | -rwxr-xr-x | 63.8 KB |
Computing file changes ...
