1
0
mirror of https://github.com/git/git.git synced 2024-09-28 20:51:42 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Jonathan Nieder b4b3360078 git-svn: strip off leading slashes on --trunk argument
The following command

 git svn clone \
	-r9500:10006 \
	svn://svn.debian.org/svn/pkg-games/packages \
	--trunk=/trunk/freedoom \
	--branches=/branches/freedoom \
	--tags=/tags/freedoom \
	freedoom.git.2009091

produces strange results:

With v1.6.3.3 (and perhaps earlier versions), this would fetch up to
and including r9978 (the last revision of the no_iwad_alternatives
branch before it was deleted), check it out, and prematurely declare
success, leaving out some commits to the trunk (r9984, r9985, r10006)
from after the branch was merged.

With v1.6.5-rc0~74 (svn: allow branches outside of refs/remotes,
2009-08-11) and later, this fetches up to and including r9978 and then
attempts a post-fetch checkout and fails.

 r9978 = 25f0920175c395f0f22f54ae7a2318147f745274
 (refs/remotes/no_iwad_alternatives)
 fatal: refs/remotes/trunk: not a valid SHA1
 update-ref refs/heads/master refs/remotes/trunk: command returned error: 128

Checking .git/config reveals

 fetch = packages//trunk/freedoom:refs/remotes/trunk

And with both 1.6.3.3 and 1.7.1, using --trunk=trunk/freedom without
the leading slash (/) works fine.

Moral: git-svn needs to scrub an initial / from $_trunk and related
arguments it receives.  Make it so.

Reported-by: Jon Dowland <jmtd@debian.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
2010-06-14 04:44:02 +00:00
block-sha1
builtin Merge branch 'mg/notes-dry-run' 2010-06-13 11:22:39 -07:00
compat Merge branch 'js/maint-windows' 2010-06-13 11:21:30 -07:00
contrib Merge branch 'maint' 2010-05-28 16:59:42 -07:00
Documentation Merge branch 'ab/cvsserver' 2010-06-13 11:22:42 -07:00
git_remote_helpers Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
git-gui
gitk-git
gitweb Merge branch 'jn/gitweb-syntax-highlight' 2010-06-13 11:21:37 -07:00
perl
ppc
t Merge branch 'ab/cvsserver' 2010-06-13 11:22:42 -07:00
templates
xdiff
.gitattributes
.gitignore Merge branch 'sr/remote-helper-export' 2010-05-21 04:02:15 -07:00
.mailmap
abspath.c
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'sp/maint-dumb-http-pack-reidx' 2010-05-21 04:02:19 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Merge branch 'rs/diff-no-minimal' 2010-06-13 11:20:46 -07:00
command-list.txt
commit.c
commit.h Merge branch 'jk/cached-textconv' 2010-05-08 22:33:08 -07:00
config.c Merge branch 'ld/discovery-limit-to-fs' (early part) 2010-05-21 04:02:15 -07:00
config.mak.in
configure.ac Merge branch 'cw/maint-exec-defpath' 2010-05-21 04:02:17 -07:00
connect.c
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Add "Z" as an alias for the timezone "UTC" 2010-05-18 22:00:17 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c test get_git_work_tree() return value for NULL 2010-05-25 09:28:51 -07:00
diff.c Merge branch 'bw/diff-metainfo-color' 2010-06-13 11:21:25 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c get_cwd_relative(): do not misinterpret suffix as subdirectory 2010-05-28 15:02:50 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c Merge branch 'cw/maint-exec-defpath' 2010-05-21 04:02:17 -07:00
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fsck.c fsck: fix bogus commit header check 2010-05-28 15:08:27 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add-interactive: Clarify “remaining hunks in the file” 2010-06-13 10:05:02 -07:00
git-am.sh Merge branch 'jc/am-3-show-corrupted-patch' 2010-05-21 04:02:18 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'js/try-to-free-stackable' 2010-06-13 11:21:21 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: Improved error handling for pserver 2010-05-19 21:02:59 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: do nothing on --dry-run 2010-05-25 10:49:54 -07:00
git-quiltimport.sh
git-rebase--interactive.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'bg/send-email-smtpdomain' 2010-05-08 22:37:34 -07:00
git-sh-setup.sh
git-stash.sh Merge branch 'cb/maint-stash-orphaned-file' 2010-05-21 04:02:23 -07:00
git-submodule.sh git-submodule foreach: Add $toplevel variable 2010-05-25 09:04:24 -07:00
git-svn.perl git-svn: strip off leading slashes on --trunk argument 2010-06-14 04:44:02 +00:00
GIT-VERSION-GEN Merge branch 'maint' 2010-05-11 23:04:47 -07:00
git-web--browse.sh
git.c
git.spec.in
graph.c
graph.h
grep.c grep: support NUL chars in search strings for -F 2010-05-24 11:22:07 -07:00
grep.h grep: support NUL chars in search strings for -F 2010-05-24 11:22:07 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c Merge branch 'sp/maint-dumb-http-pack-reidx' 2010-05-21 04:02:19 -07:00
http.c Merge branch 'sp/maint-dumb-http-pack-reidx' 2010-05-21 04:02:19 -07:00
http.h Merge branch 'sp/maint-dumb-http-pack-reidx' 2010-05-21 04:02:19 -07:00
ident.c
imap-send.c
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'js/maint-windows' 2010-06-13 11:21:30 -07:00
match-trees.c
merge-file.c Merge branch 'rs/diff-no-minimal' 2010-06-13 11:20:46 -07:00
merge-recursive.c
merge-recursive.h
name-hash.c
notes-cache.c
notes-cache.h
notes.c notes: dry-run and verbose options for prune 2010-05-19 23:57:18 -07:00
notes.h notes: dry-run and verbose options for prune 2010-05-19 23:57:18 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h Merge branch 'sp/maint-dumb-http-pack-reidx' 2010-05-21 04:02:19 -07:00
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'wp/pretty-enhancement' 2010-06-13 11:21:00 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Start 1.7.2 cycle 2010-05-08 22:58:36 -07:00
remote-curl.c Merge branch 'rc/maint-curl-helper' 2010-05-08 22:37:24 -07:00
remote.c Merge branch 'maint' 2010-06-07 22:15:31 -07:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c start_command: close cmd->err descriptor when fork/spawn fails 2010-05-20 16:11:29 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'maint' 2010-06-06 18:42:12 -07:00
sha1_file.c Merge branch 'jk/maint-sha1-file-name-fix' 2010-06-13 11:22:00 -07:00
sha1_name.c
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'cb/assume-unchanged-fix' 2010-06-13 11:21:11 -07:00
unpack-trees.h
upload-pack.c
usage.c
userdiff.c Merge branch 'bs/userdiff-php' 2010-06-13 11:22:05 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'js/try-to-free-stackable' 2010-06-13 11:21:21 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'mg/advice-statushints' 2010-05-21 04:02:23 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.