summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* git-svn: change ; to && in addremove()Eric Wong2006-02-201-2/+2
| | | | | Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: remove any need for the XML::Simple dependencyEric Wong2006-02-201-49/+35
| | | | | | | | | | | XML::Simple was originally required back when I made svn-arch-mirror because I needed to explictly track renames with Arch. Then I carried it over to git-svn because I was afraid somebody could commit an svn log message that could throw off a non-XML log parser. Then I noticed the <n> lines column in the header. So, no more XML :) Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: Allow for more argument types for commit (from..to)Eric Wong2006-02-202-4/+11
| | | | | | | | | | Allow 'from..to' notation from the command line. More liberal sha1 parsing when reading from stdin no longer requires the sha1 to be the first character, so a leading 'commit ' string is OK. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: allow --find-copies-harder and -l<num> to be passed on commitEric Wong2006-02-202-2/+15
| | | | | | | | Both of these options are passed directly to git-diff-tree when committing to a SVN repository. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: fix a typo in defining the --no-stop-on-copy optionEric Wong2006-02-201-1/+1
| | | | | | | | Just a typo, I doubt anybody would use (and I highly recommend not using) this option anyways. But you never know... Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/merge-msg'Junio C Hamano2006-02-191-11/+19
|\ | | | | | | | | | | * jc/merge-msg: fmt-merge-msg: do not add excess newline at the end. fmt-merge-msg: say which branch things were merged into unless 'master'
| * fmt-merge-msg: do not add excess newline at the end.Junio C Hamano2006-02-191-0/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * fmt-merge-msg: say which branch things were merged into unless 'master'Junio C Hamano2006-02-181-11/+18
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/mv'Junio C Hamano2006-02-191-0/+9
|\ \ | | | | | | | | | | | | * jc/mv: Allow git-mv to accept ./ in paths.
| * | Allow git-mv to accept ./ in paths.Junio C Hamano2006-02-181-0/+9
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Documentation: fix typo in rev-parse --short option description.Junio C Hamano2006-02-191-1/+1
|/ / | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge fixes up to GIT 1.2.2Junio C Hamano2006-02-1810-33/+122
|\ \ | |/ |/|
| * Fix retries in git-cvsimportv1.2.2Martin Mares2006-02-181-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>
| * archimport: remove files from the index before adding/updatingEric Wong2006-02-181-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>
| * Make git-reset delete empty directoriesShawn Pearce2006-02-172-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.]
| * Document --short and --git-dir in git-rev-parse(1)Jonas Fonseca2006-02-171-0/+8
| | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
| * git-rev-parse: Fix --short= option parsingJonas Fonseca2006-02-171-3/+3
| | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
| * Prevent git-upload-pack segfault if object cannot be foundCarl Worth2006-02-172-1/+6
| | | | | | | | | | Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Abstract test_create_repo out for use in tests.Carl Worth2006-02-171-6/+17
| | | | | | | | | | Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Trap exit to clean up created directory if clone fails.Carl Worth2006-02-171-0/+4
| | | | | | | | | | Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add an Emacs interface in contrib.Alexandre Julliard2006-02-181-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>
* | Merge branch 'jc/topo'Junio C Hamano2006-02-185-9/+29
|\ \ | | | | | | | | | | | | * jc/topo: topo-order: make --date-order optional.
| * | topo-order: make --date-order optional.Junio C Hamano2006-02-155-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>
* | | Merge branch 'jc/rebase-limit'Junio C Hamano2006-02-181-18/+71
|\ \ \ | | | | | | | | | | | | | | | | * jc/rebase-limit: rebase: allow rebasing onto different base.
| * | | rebase: allow rebasing onto different base.Junio C Hamano2006-02-141-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>
* | | | gitview: typofixAneesh Kumar K.V2006-02-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
* | | | git-svn: remove files from the index before adding/updatingEric Wong2006-02-181-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>
* | | | SubmittingPatches: note on whitespacesJunio C Hamano2006-02-171-11/+19
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add a README for gitviewAneesh Kumar K.V2006-02-171-0/+38
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Add contrib/README.Junio C Hamano2006-02-171-0/+44
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-tag: -l to list tags (usability).Junio C Hamano2006-02-172-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>
* | | | Add contrib/gitview from Aneesh.Aneesh Kumar2006-02-171-0/+992
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-svn: ensure fetch always works chronologically.Eric Wong2006-02-171-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>
* | | | git-svn: fix revision order when XML::Simple is not loadedEric Wong2006-02-171-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>
* | | | Introducing contrib/git-svn.Eric Wong2006-02-162-0/+978
| | | |
* | | | Allow building Git in systems without iconvFernando J. Pereda2006-02-162-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>
* | | Merge branch 'jc/add'Junio C Hamano2006-02-151-0/+11
|\ \ \ | | | | | | | | | | | | | | | | * jc/add: Detect misspelled pathspec to git-add
| * | | Detect misspelled pathspec to git-addJunio C Hamano2006-02-151-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>
* | | | Merge fixes up to 1.2.1Junio C Hamano2006-02-153-6/+22
|\ \ \ \ | | |_|/ | |/| |
| * | | More useful/hinting error messages in git-checkoutv1.2.1Josef Weidendorfer2006-02-151-3/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Print an error if cloning a http repo and NO_CURL is setFernando J. Pereda2006-02-152-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>
| * | | checkout: fix dirty-file display.Junio C Hamano2006-02-141-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>
* | | | packed objects: minor cleanupJunio C Hamano2006-02-153-5/+5
| |/ / |/| | | | | | | | | | | | | | The delta depth is unsigned. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | ls-files --error-unmatch pathspec error reporting fix.Junio C Hamano2006-02-151-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>
* | | Merge branch 'kh/svn'Junio C Hamano2006-02-142-3/+8
|\ \ \ | | | | | | | | | | | | | | | | * kh/svn: git-svnimport: -r adds svn revision number to commit messages
| * | | git-svnimport: -r adds svn revision number to commit messagesKarl Hasselström2006-02-142-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>
* | | Merge branch 'jc/commit'Junio C Hamano2006-02-144-18/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/commit: commit: detect misspelled pathspec while making a partial commit. combine-diff: diff-files fix (#2) combine-diff: diff-files fix.
| * | | commit: detect misspelled pathspec while making a partial commit.Junio C Hamano2006-02-142-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>
| * | combine-diff: diff-files fix (#2)Junio C Hamano2006-02-141-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>
| * | combine-diff: diff-files fix.Junio C Hamano2006-02-131-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>
View Lorry Controller Status