summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-03-23Merge branch 'jc/name' into nextLibravatar Junio C Hamano13-4/+16
* jc/name: sha1_name: make core.warnambiguousrefs the default. sha1_name: warning ambiguous refs.
2006-03-23sha1_name: make core.warnambiguousrefs the default.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-23sha1_name: warning ambiguous refs.Libravatar Junio C Hamano12-3/+15
This makes sure that many commands that take refs on the command line to honor core.warnambiguousrefs configuration. Earlier, the commands affected by this patch did not read the configuration file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-22Merge branch 'jc/pull' into nextLibravatar Junio C Hamano1-2/+10
* jc/pull: git-pull: reword "impossible to fast-forward" message. git-pull: further safety while on tracking branch.
2006-03-22git-pull: reword "impossible to fast-forward" message.Libravatar Junio C Hamano1-1/+7
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-22git-pull: further safety while on tracking branch.Libravatar Junio C Hamano1-1/+3
Running 'git pull' while on the tracking branch has a built-in safety valve to fast-forward the index and working tree to match the branch head, but it errs on the safe side too cautiously. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-22Merge branch 'jc/revlist' into nextLibravatar Junio C Hamano4-11/+24
* jc/revlist: rev-list --timestamp git-apply: do not barf when updating an originally empty file. http-push.c: squelch C90 warnings. fix field width/precision warnings in blame.c
2006-03-22Merge branch 'jc/clone' into nextLibravatar Junio C Hamano1-2/+2
* jc/clone: git-clone: typofix.
2006-03-22git-clone: typofix.Libravatar Junio C Hamano1-2/+2
The traditional one created refs/origin by mistake, not refs/heads/origin. Also it mistakenly failed to prevent $origin from being listed twice in remotes/origin file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-22rev-list --timestampLibravatar Junio C Hamano1-1/+10
This prefixes the raw commit timestamp to the output. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-22git-apply: do not barf when updating an originally empty file.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-21http-push.c: squelch C90 warnings.Libravatar Junio C Hamano1-8/+12
If you write code after declarations in a block, gcc scolds you with "warning: ISO C90 forbids mixed declarations and code". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-21fix field width/precision warnings in blame.cLibravatar Luck, Tony1-1/+1
Using "size_t" values for printf field width/precision upsets gcc, it wants to see an "int". Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-21Merge branch 'jc/clone' into nextLibravatar Junio C Hamano1-3/+9
* jc/clone: clone: record the remote primary branch with remotes/$origin/HEAD
2006-03-21Merge branch 'jc/name' into nextLibravatar Junio C Hamano1-11/+12
* jc/name: get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEAD
2006-03-21clone: record the remote primary branch with remotes/$origin/HEADLibravatar Junio C Hamano1-3/+9
This matches c51d13692d4e451c755dd7da3521c5db395df192 commit to record the primary branch of the remote with a symbolic ref remotes/$origin/HEAD. The user can later change it to point at different branch to change the meaning of "$origin" shorthand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-21get_sha1_basic(): try refs/... and finally refs/remotes/$foo/HEADLibravatar Junio C Hamano1-11/+12
This implements the suggestion by Jeff King to use refs/remotes/$foo/HEAD to interpret a shorthand "$foo" to mean the primary branch head of a tracked remote. clone needs to be told about this convention as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-21Merge branch 'jc/name' into nextLibravatar Junio C Hamano10-30/+297
* jc/name: core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists. contrib/git-svn: allow rebuild to work on non-linear remote heads http-push: don't assume char is signed http-push: add support for deleting remote branches Be verbose when !initial commit Fix multi-paragraph list items in OPTIONS section http-fetch: nicer warning for a server with unreliable 404 status
2006-03-21Merge branch 'jc/clone' into nextLibravatar Junio C Hamano1-19/+31
* jc/clone: revamp git-clone (take #2).
2006-03-21revamp git-clone (take #2).Libravatar Junio C Hamano1-19/+31
This builds on top of the previous one. * --use-separate-remote uses .git/refs/remotes/$origin/ directory to keep track of the upstream branches. * The $origin above defaults to "origin" as usual, but the existing "-o $origin" option can be used to override it. I am not yet convinced if we should make "$origin" the synonym to "refs/remotes/$origin/$name" where $name is the primary branch name of $origin upstream, nor if so how we should decide which upstream branch is the primary one, but that is more or less orthogonal to what the clone does here. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20core.warnambiguousrefs: warns when "name" is used and both "name" branch and ↵Libravatar Junio C Hamano4-3/+27
tag exists. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20contrib/git-svn: allow rebuild to work on non-linear remote headsLibravatar Eric Wong1-1/+13
Because committing back to an SVN repository from different machines can result in different lineages, two different repositories running git-svn can result in different commit SHA1s (but of the same tree). Sometimes trees that are tracked independently are merged together (usually via children), resulting in non-unique git-svn-id: lines in rev-list. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20http-push: don't assume char is signedLibravatar Nick Hengeveld1-1/+1
Declare remote_dir_exists[] as signed char to be sure that values of -1 are valid. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20http-push: add support for deleting remote branchesLibravatar Nick Hengeveld1-1/+218
Processes new command-line arguments -d and -D to remove a remote branch if the following conditions are met: - one branch name is present on the command line - the specified branch name matches exactly one remote branch name - the remote HEAD is a symref - the specified branch is not the remote HEAD - the remote HEAD resolves to an object that exists locally (-d only) - the specified branch resolves to an object that exists locally (-d only) - the specified branch is an ancestor of the remote HEAD (-d only) Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20Be verbose when !initial commitLibravatar Yasushi SHOJI1-1/+1
verbose option in git-commit.sh lead us to run git-diff-index, which needs a commit-ish we are making diff against. When we are commiting the fist set, we obviously don't have any commit-ish in the repo. So we just skip the git-diff-index run. It might be possible to produce diff against empty but do we need that? Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20Fix multi-paragraph list items in OPTIONS sectionLibravatar Francis Daly2-23/+29
This patch makes the html docs right, makes the asciidoc docs a bit odd but consistent with what is there already, and makes the manpages look OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69. For the manpages, current is like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT With this patch, docbook-xsl v1.68 looks like -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and while docbook-xsl v1.69 becomes -A <author_file> Read a file with lines on the form username = User's Full Name <email@addr.es> and use "User's Full Name <email@addr.es>" as the GIT author and The extra indentation is to keep the v1.69 manpage looking sane.
2006-03-20http-fetch: nicer warning for a server with unreliable 404 statusLibravatar Junio C Hamano1-0/+8
When a repository otherwise properly prepared is served by a dumb HTTP server that sends "No such page" output with 200 status for human consumption to a request for a page that does not exist, the users will get an alarming "File X corrupt" error message. Hint that they might be dealing with such a server at the end and suggest running fsck-objects to check if the result is OK (the pack-fallback code does the right thing in this case so unless a loose object file was actually corrupt the result should check OK). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20Merge branch 'jc/merge' into nextLibravatar Junio C Hamano4-56/+90
* jc/merge: git-merge knows some strategies want to skip trivial merges generate-cmdlist: style cleanups. Add missing semicolon to sed command. unpack_delta_entry(): reduce memory footprint. git.el: Added a function to diff against the other heads in a merge. git.el: Get the default user name and email from the repository config. git.el: More robust handling of subprocess errors when returning strings.
2006-03-20Merge branch 'jc/clone' into nextLibravatar Junio C Hamano2-36/+166
* jc/clone: revamp git-clone.
2006-03-20git-merge knows some strategies want to skip trivial mergesLibravatar Junio C Hamano1-27/+40
Most notably "ours". Also this makes sure we do not record duplicated parents on the parent list of the resulting commit. This is based on Mark Wooding's work, but does not change the UI nor introduce new flags. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-20revamp git-clone.Libravatar Junio C Hamano2-36/+166
This does two things. * A new flag --reference can be used to name a local repository that is to be used as an alternate. This is in response to an inquiry by James Cloos in the message on the list <m3r74ykue7.fsf@lugabout.cloos.reno.nv.us>. * A new flag --use-separate-remote stops contaminating local branch namespace by upstream branch names. The upstream branch heads are copied in .git/refs/remotes/ instead of .git/refs/heads/ and .git/remotes/origin file is set up to reflect this as well. It requires to have fetch/pull update to understand .git/refs/remotes by Eric Wong to further update the repository cloned this way. For the former change, git-fetch-pack is taught a new flag --all to fetch from all the remote heads. Nobody uses the git-clone-pack with this change, so we could deprecate the command, but removal of the command will be left to a separate round. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19generate-cmdlist: style cleanups.Libravatar Junio C Hamano1-3/+7
Instead of giving multiple commands concatenated with semicolon to sed, write them on separate lines. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19Add missing semicolon to sed command.Libravatar Shawn Pearce1-1/+1
generate-cmdlist.sh is giving errors messages from sed on Mac OS 10.4 due to a missing semicolon. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19unpack_delta_entry(): reduce memory footprint.Libravatar Junio C Hamano1-8/+10
Currently we unpack the delta data from the pack and then unpack the base object to apply that delta data to it. When getting an object that is deeply deltified, we can reduce memory footprint by unpacking the base object first and then unpacking the delta data, because we will need to keep at most one delta data in memory that way. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19git.el: Added a function to diff against the other heads in a merge.Libravatar Alexandre Julliard1-0/+11
git-diff-file-merge-head generates a diff against the first merge head, or with a prefix argument against the nth head. Bound to `d h' by default. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19git.el: Get the default user name and email from the repository config.Libravatar Alexandre Julliard1-2/+9
If user name or email are not set explicitly, get them from the user.name and user.email configuration values before falling back to the Emacs defaults. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-19git.el: More robust handling of subprocess errors when returning strings.Libravatar Alexandre Julliard1-16/+13
Make sure that functions that call a git process and return a string always return nil when the subprocess failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'master' into nextLibravatar Junio C Hamano2-3/+11
* master: Makefile: Add TAGS and tags targets ls-files: Don't require exclude files to end with a newline.
2006-03-18Makefile: Add TAGS and tags targetsLibravatar Fredrik Kuivinen1-2/+9
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18ls-files: Don't require exclude files to end with a newline.Libravatar Alexandre Julliard1-1/+2
Without this patch, the last line of an exclude file is silently ignored if it doesn't end with a newline. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'master' into nextLibravatar Junio C Hamano1-2/+2
* master: git-pull: run repo-config with dash form.
2006-03-18git-pull: run repo-config with dash form.Libravatar Junio C Hamano1-2/+2
... as discussed on the list for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'jc/cvsimport' into nextLibravatar Junio C Hamano1-0/+1
* jc/cvsimport: cvsimport: fix reading from rev-parse
2006-03-18cvsimport: fix reading from rev-parseLibravatar Junio C Hamano1-0/+1
The updated code reads the tip of the current branch before and after the import runs, but forgot to chomp what we read from the command. The read-tree command did not them with the trailing LF. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-18Merge branch 'jc/empty'Libravatar Junio C Hamano1-2/+10
* jc/empty: revision traversal: --remove-empty fix (take #2). revision traversal: --remove-empty fix. Conflicts: revision.c (adjust for the updates by Fredrik)
2006-03-17Merge branch 'master' into nextLibravatar Junio C Hamano8-23/+60
* master: 3% tighter packs for free Rewrite synopsis to clarify the two primary uses of git-checkout. Fix minor typo. Reference git-commit-tree for env vars. Clarify git-rebase example commands. Document the default source of template files. Call out the two different uses of git-branch and fix a typo. Add git-show reference
2006-03-173% tighter packs for freeLibravatar Nicolas Pitre1-1/+16
This patch makes for 3.4% smaller pack with the git repository, and a bit more than 3% smaller pack with the kernel repository. And so with _no_ measurable CPU difference. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Rewrite synopsis to clarify the two primary uses of git-checkout.Libravatar Jon Loeliger1-10/+13
Fix a few typo/grammar problems. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Fix minor typo.Libravatar Jon Loeliger1-1/+1
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-17Reference git-commit-tree for env vars.Libravatar Jon Loeliger1-0/+4
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 23:00:17 +0000