summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-02-19Documentation: fix typo in rev-parse --short option description.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-18Merge fixes up to GIT 1.2.2Libravatar Junio C Hamano10-33/+122
2006-02-18Fix retries in git-cvsimportLibravatar Martin Mares1-8/+5
Fixed a couple of bugs in recovering from broken connections: The _line() method now returns undef correctly when the connection is broken instead of falling off the function and returning garbage. Retries are now reported to stderr and the eventual partially downloaded file is discarded instead of being appended to. The "Server gone away" test has been removed, because it was reachable only if the garbage return bug bit. Signed-off-by: Martin Mares <mj@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-18archimport: remove files from the index before adding/updatingLibravatar Eric Wong1-15/+13
This fixes a bug when importing where a directory gets removed/renamed but is immediately replaced by a file of the same name in the same changeset. This fix only applies to the accurate (default) strategy the moment. This patch should also fix the fast strategy if/when it is updated to handle the cases that would've triggered this bug. This bug was originally found in git-svn, but I remembered I did the same thing with archimport as well. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-18Add an Emacs interface in contrib.Libravatar Alexandre Julliard1-0/+956
This is an Emacs interface for git. The user interface is modeled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs. The basic command is 'M-x git-status' which displays a buffer listing modified files in the selected project tree. In that buffer the following features are supported: - add/remove files - list unknown files - commit marked files - manage .gitignore - commit merges based on MERGE_HEAD - revert files to the HEAD version - resolve conflicts with smerge or ediff - diff files against HEAD/base/mine/other or combined diff - get a log of the revisions for specified files There are plenty of unimplemented features too, see the TODO list at the top of the file... Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-18Merge branch 'jc/topo'Libravatar Junio C Hamano5-9/+29
* jc/topo: topo-order: make --date-order optional.
2006-02-18Merge branch 'jc/rebase-limit'Libravatar Junio C Hamano1-18/+71
* jc/rebase-limit: rebase: allow rebasing onto different base.
2006-02-18gitview: typofixLibravatar Aneesh Kumar K.V1-1/+1
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
2006-02-18git-svn: remove files from the index before adding/updatingLibravatar Eric Wong1-6/+5
This fixes a bug when importing where a directory gets removed/renamed but is immediately replaced by a file of the same name in the same revision. Signed-off-by: Eric Wong <normalperson@yhbt.net>
2006-02-17Make git-reset delete empty directoriesLibravatar Shawn Pearce2-0/+66
When git-reset --hard is used and a subdirectory becomes empty (as it contains no tracked files in the target tree) the empty subdirectory should be removed. This matches the behavior of git-checkout-index and git-read-tree -m which would not have created the subdirectory or would have deleted it when updating the working directory. Subdirectories which are not empty will be left behind. This may happen if the subdirectory still contains object files from the user's build process (for example). [jc: simplified the logic a bit, while keeping the test script.]
2006-02-17Document --short and --git-dir in git-rev-parse(1)Libravatar Jonas Fonseca1-0/+8
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
2006-02-17git-rev-parse: Fix --short= option parsingLibravatar Jonas Fonseca1-3/+3
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
2006-02-17Prevent git-upload-pack segfault if object cannot be foundLibravatar Carl Worth2-1/+6
Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17Abstract test_create_repo out for use in tests.Libravatar Carl Worth1-6/+17
Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17Trap exit to clean up created directory if clone fails.Libravatar Carl Worth1-0/+4
Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17SubmittingPatches: note on whitespacesLibravatar Junio C Hamano1-11/+19
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17Add a README for gitviewLibravatar Aneesh Kumar K.V1-0/+38
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17Add contrib/README.Libravatar Junio C Hamano1-0/+44
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17git-tag: -l to list tags (usability).Libravatar Junio C Hamano2-2/+22
git-tag -l lists all tags, and git-tag -l <pattern> filters the result with <pattern>. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17Add contrib/gitview from Aneesh.Libravatar Aneesh Kumar1-0/+992
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17git-svn: ensure fetch always works chronologically.Libravatar Eric Wong1-3/+4
We run svn log against a URL without a working copy for the first fetch, so we end up a log that's sorted from highest to lowest. That's bad, we always want lowest to highest. Just default to --revision 0:HEAD now if -r isn't specified for the first fetch. Also sort the revisions after we get them just in case somebody accidentally reverses the argument to --revision for whatever reason. Thanks again to Emmanuel Guerin for helping me find this. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-17git-svn: fix revision order when XML::Simple is not loadedLibravatar Eric Wong1-3/+3
Thanks to Emmanuel Guerin for finding the bug. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-16Introducing contrib/git-svn.Libravatar Eric Wong2-0/+978
2006-02-16Allow building Git in systems without iconvLibravatar Fernando J. Pereda2-0/+10
Systems using some uClibc versions do not properly support iconv stuff. This patch allows Git to be built on those systems by passing NO_ICONV=YesPlease to make. The only drawback is mailinfo won't do charset conversion in those systems. Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15topo-order: make --date-order optional.Libravatar Junio C Hamano5-9/+29
This adds --date-order to rev-list; it is similar to topo order in the sense that no parent comes before all of its children, but otherwise things are still ordered in the commit timestamp order. The same flag is also added to show-branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15Merge branch 'jc/add'Libravatar Junio C Hamano1-0/+11
* jc/add: Detect misspelled pathspec to git-add
2006-02-15Merge fixes up to 1.2.1Libravatar Junio C Hamano3-6/+22
2006-02-15More useful/hinting error messages in git-checkoutLibravatar Josef Weidendorfer1-3/+10
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15Print an error if cloning a http repo and NO_CURL is setLibravatar Fernando J. Pereda2-1/+8
If Git is compiled with NO_CURL=YesPlease and one tries to clone a http repository, git-clone tries to call the curl binary. This trivial patch prints an error instead in such situation. Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15packed objects: minor cleanupLibravatar Junio C Hamano3-5/+5
The delta depth is unsigned. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15Detect misspelled pathspec to git-addLibravatar Junio C Hamano1-0/+11
This is in the same spirit as an earlier patch for git-commit. It does an extra ls-files to avoid complaining when a fully tracked directory name is given on the command line (otherwise --others restriction would say the pathspec does not match). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-15ls-files --error-unmatch pathspec error reporting fix.Libravatar Junio C Hamano1-1/+1
Earlier patch mistakenly used prefix_len when it meant prefix_offset. The latter is to strip the leading directories when run from a subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-14Merge branch 'kh/svn'Libravatar Junio C Hamano2-3/+8
* kh/svn: git-svnimport: -r adds svn revision number to commit messages
2006-02-14Merge branch 'jc/commit'Libravatar Junio C Hamano4-18/+60
* jc/commit: commit: detect misspelled pathspec while making a partial commit. combine-diff: diff-files fix (#2) combine-diff: diff-files fix.
2006-02-14Merge branch 'jc/rebase'Libravatar Junio C Hamano2-0/+159
* jc/rebase: rebase: allow a hook to refuse rebasing.
2006-02-14Merge branch 'ra/email'Libravatar Junio C Hamano2-5/+28
* ra/email: send-email: Add --cc send-email: Add some options for controlling how addresses are automatically added to the cc: list.
2006-02-14rebase: allow rebasing onto different base.Libravatar Junio C Hamano1-18/+71
This allows you to rewrite history a bit more flexibly, by separating the other branch name and new branch point. By default, the new branch point is the same as the tip of the other branch as before, but you can specify where you graft the rebased branch onto. When you have this ancestry graph: A---B---C topic / D---E---F---G master $ git rebase --onto master~1 master topic would rewrite the history to look like this: A'\''--B'\''--C'\'' topic / D---E---F---G master Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-14checkout: fix dirty-file display.Libravatar Junio C Hamano1-2/+4
When we refused to switch branches, we incorrectly showed differences from the branch we would have switched to. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-14commit: detect misspelled pathspec while making a partial commit.Libravatar Junio C Hamano2-17/+53
When you say "git commit Documentaiton" to make partial commit for the files only in that directory, we did not detect that as a misspelled pathname and attempted to commit index without change. If nothing matched, there is no harm done, but if the index gets modified otherwise by having another valid pathspec or after an explicit update-index, a user will not notice without paying attention to the "git status" preview. This introduces --error-unmatch option to ls-files, and uses it to detect this common user error. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-14git-svnimport: -r adds svn revision number to commit messagesLibravatar Karl Hasselström2-3/+8
New -r flag for prepending the corresponding Subversion revision number to each commit message. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-14combine-diff: diff-files fix (#2)Libravatar Junio C Hamano1-0/+2
The raw format "git-diff-files -c" to show unmerged state forgot to initialize the status fields from parents, causing NUL characters to be emitted. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13Merge some proposed fixesLibravatar Junio C Hamano3-2/+3
Conflicts: Documentation/git-commit.txt - taking the post 1.2.0 semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13Merge branch 'pb/bisect'Libravatar Junio C Hamano1-3/+14
* pb/bisect: Properly git-bisect reset after bisecting from non-master head
2006-02-13combine-diff: diff-files fix.Libravatar Junio C Hamano1-4/+5
When showing a conflicted merge from index stages and working tree file, we did not fetch the mode from the working tree, and mistook that as a deleted file. Also if the manual resolution (or automated resolution by git rerere) ended up taking either parent's version, we did not show _anything_ for that path. Either was quite bad and confusing. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13s/SHELL/SHELL_PATH/ in MakefileLibravatar Fredrik Kuivinen1-1/+1
With the current Makefile we don't use the shell chosen by the platform specific defines when we invoke GIT-VERSION-GEN. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13bisect: remove BISECT_NAMES after done.Libravatar Junio C Hamano1-0/+1
I noticed that we forgot to clean this file and kept it that way, while trying to help with Andrew's bisect problem. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13Documentation: git-ls-files asciidocco.Libravatar Junio C Hamano1-1/+1
Noticed by Jon Nelson. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13send-email: Add --ccLibravatar Ryan Anderson2-2/+9
Since Junio used this in an example, and I've personally tried to use it, I suppose the option should actually exist. Signed-off-by: Ryan Anderson <ryan@michonline.com>
2006-02-13Documentation: git-commit in 1.2.X series defaults to --include.Libravatar Junio C Hamano1-7/+27
The documentation was mistakenly describing the --only semantics to be default. The 1.2.0 release and its maintenance series 1.2.X will keep the traditional --include semantics as the default. Clarify the situation. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-13send-email: Add some options for controlling how addresses are automatically ↵Libravatar Ryan Anderson2-3/+19
added to the cc: list. Signed-off-by: Ryan Anderson <ryan@michonline.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 14:53:42 +0000