aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Collapse)AuthorAge
* Add missing functions to contrib/emacs/vc-git.elDavid Kastrup2007-07-12
| | | | | | | | This is necessary to make several editing functions work, like C-u C-x v = Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Correct shebang line for contrib/stats/packinfo.plBrian Downing2007-07-12
| | | | | | | "/bin/perl"? What was I thinking? Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* script to display a distribution of longest common hash prefixesNicolas Pitre2007-07-12
| | | | | | | | This script was originally posted on the git mailing list by Randal L. Schwartz <merlyn@stonehenge.com>. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Pack information toolBrian Downing2007-07-11
| | | | | | | | | | | | | This tool will print vaguely pretty information about a pack. It expects the output of "git-verify-pack -v" as input on stdin. $ git-verify-pack -v | packinfo.pl See the documentation in the script (contrib/stats/packinfo.pl) for more information. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-06
| | | | | | | | | | | | | | | | | | | Earlier, "git rerere" was enabled by creating the directory .git/rr-cache. That is definitely not in line with most other features, which are enabled by a config variable. So, check the config variable "rerere.enabled". If it is set to "false" explicitely, do not activate rerere, even if .git/rr-cache exists. This should help when you want to disable rerere temporarily. If "rerere.enabled" is not set at all, fall back to detection of the directory .git/rr-cache. [jc: with minimum tweaks] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-06-26
|\ | | | | | | | | * 'master' of git://repo.or.cz/git/fastimport: Teach bash how to complete +refspec on git-push
| * Teach bash how to complete +refspec on git-pushShawn O. Pearce2007-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | Using `git push origin +foo` to forcefully overwrite the remote branch named foo is a common idiom, especially since + is shorter than the long option --force and can be specified on a per-branch basis. We now complete `git push origin +foo` just like we do the standard `git push origin foo`. The leading + on a branch refspec does not alter the completion. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | git-new-workdir: Fix shell warning about operator == used with test.Simon Hausmann2007-06-26
|/ | | | | | | Use = instead of == with test to test for equality. Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* new-workdir: handle rev-parse --git-dir not always giving full pathJulian Phillips2007-06-24
| | | | | | | | | rev-parse --git-dir outputs a full path - except for the single case of when the path would be $(pwd)/.git, in which case it outputs simply .git. Check for this special case and handle it. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Import branch 'git-p4' of git://repo.or.cz/fast-exportShawn O. Pearce2007-06-22
|\ | | | | | | | | | | | | | | | | Simon has asked that the git.git project include the git-p4 project as at least a contrib/fast-import within git.git. I think it makes a lot of sense, as git-p4 nicely complements the only other in-tree fast-import user: import-tars.perl. git-p4 is offered under the MIT license by its authors.
| * Make it possible to specify the HEAD for the internal ↵Simon Hausmann2007-06-22
| | | | | | | | | | | | | | | | findUpstreamBranchPoint function. This isn't used right now in git-p4 but I use it in an external script that loads git-p4 as module. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * Added git-p4 branches command that shows the mapping of perforce depot paths ↵Simon Hausmann2007-06-20
| | | | | | | | | | | | to imported git branches. Signed-off-by: Simon Hausmann <simon@lst.de>
| * Warn about conflicting p4 branch mappings and use the first one found.Simon Hausmann2007-06-17
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix the branch mapping detection to be independent from the order of the "p4 ↵Simon Hausmann2007-06-17
| | | | | | | | | | | | | | | | | | | | branches" output. Collect "unknown" source branches separately and register them at the end. Also added a minor speed up to splitFilesIntoBranches by breaking out of the loop through all branches when it's safe. Signed-off-by: Simon Hausmann <simon@lst.de>
| * git-p4 fails when cloning a p4 depo.Benjamin Sergeant2007-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A perforce command with all the files in the repo is generated to get all the file content. Here is a patch to break it into multiple successive perforce command who uses 4K of parameter max, and collect the output for later. It works, but not for big depos, because the whole perforce depo content is stored in memory in P4Sync.run(), and it looks like mine is bigger than 2 Gigs, so I had to kill the process. [Simon: I added the bit about using SC_ARG_MAX, as suggested by Han-Wen] Signed-off-by: Benjamin Sergeant <bsergean@gmail.com> Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix initial multi-branch import.Simon Hausmann2007-06-16
| | | | | | | | | | | | The list of existing p4 branches in git wasn't initialized. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * Only use double quotes on WindowsMarius Storm-Olsen2007-06-12
| | | | | | | | Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
| * Fix git-p4 rebase to detect the correct upstream branch instead of ↵Simon Hausmann2007-06-12
| | | | | | | | | | | | | | | | unconditionally always rebasing on top of remotes/p4/master Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * Moved the code from git-p4 submit to figure out the upstream branch pointSimon Hausmann2007-06-12
| | | | | | | | | | | | into a separate helper method. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * git-p4 submit: Fix missing quotes around p4 commands to make them work with ↵Simon Hausmann2007-06-11
| | | | | | | | | | | | | | | | spaces in filenames Noticed by Alex Riesen Signed-off-by: Simon Hausmann <simon@lst.de>
| * Mention remotes/p4/master also in the documentation.Simon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Provide some information for single branch imports where the commits goSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * git-p4: check for existence of repo dir before trying to createKevin Green2007-06-11
| | | | | | | | | | | | | | | | | | | | | | When using git-p4 in this manner: git-p4 clone //depot/path/project myproject If "myproject" already exists as a dir, but not a valid git repo, it fails to create the directory. Signed-off-by: Kevin Green <Kevin.Green@morganstanley.com>
| * Write out the options tag in the log message of imports only if we actually haveSimon Hausmann2007-06-11
| | | | | | | | | | | | options Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix support for explicit disabling of syncing with the originSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix depot-paths encoding for multi-path imports (don't split up ↵Simon Hausmann2007-06-11
| | | | | | | | | | | | //depot/path/foo) Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix project name guessingSimon Hausmann2007-06-11
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fix updating/creating remotes/p4/* heads from origin/p4/*Simon Hausmann2007-06-10
| | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| * Fixed the check to make sure to exclude the HEAD symbolic refs when updatingSimon Hausmann2007-06-10
| | | | | | | | | | | | the remotes/p4 branches from origin. Signed-off-by: Simon Hausmann <simon@lst.de>
| * also strip p4/ from local imports.Han-Wen Nienhuys2007-06-08
| | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * Merge branch 'master' of git://repo.or.cz/fast-exportHan-Wen Nienhuys2007-06-08
| |\
| | * Only get the expensive branch mapping from the p4 server when notSimon Hausmann2007-06-08
| | | | | | | | | | | | | | | | | | | | | syncing with the help of an origin remote (which we instead then use to get new branches from). Signed-off-by: Simon Hausmann <simon@lst.de>
| | * Make git-p4 submit detect the correct reference (origin) branch whenSimon Hausmann2007-06-07
| | | | | | | | | | | | | | | | | | working with multi-branch imports. Signed-off-by: Simon Hausmann <simon@lst.de>
| | * Make clone behave like git clone by default again.Simon Hausmann2007-06-07
| | | | | | | | | | | | Signed-off-by: Simon Hausmann <simon@lst.de>
| | * Exclude the HEAD symbolic ref from the list of known branchesMarius Storm-Olsen2007-06-07
| | | | | | | | | | | | Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
| | * Fix single branch import into remotesMarius Storm-Olsen2007-06-07
| | | | | | | | | | | | Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
| | * Fix git-p4 clone (defaultDestination)Marius Storm-Olsen2007-06-07
| | | | | | | | | | | | Signed-off-by: Marius Storm-Olsen <mstormo_git@storm-olsen.com>
| | * Ensure that the commit message is Windows formated (CRLF) before invoking ↵Marius Storm-Olsen2007-06-07
| | | | | | | | | | | | | | | | | | | | | | | | the editor. (The default editor on Windows (Notepad) doesn't handle Unix line endings) Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
| | * Fix depot-path determination for git-p4 submitSimon Hausmann2007-06-07
| | | | | | | | | | | | Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Fix git-p4 submitSimon Hausmann2007-06-07
| | | | | | | | | | | | Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Fix git-p4 rebaseSimon Hausmann2007-06-07
| | | | | | | | | | | | Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Hack to make the multi-branch import work again with self.depotPaths now thatSimon Hausmann2007-06-07
| | | | | | | | | | | | | | | | | | self.depotPath is gone Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Don't attempt to set the initialParent on multi-branch imports (useless).Simon Hausmann2007-06-07
| | | | | | | | | | | | | | | | | | | | | At some point the code paths should be unified, but for now I need a working git-p4 :) Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Fix common path "calculation" from logs of multiple branches.Simon Hausmann2007-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to use min instead of max for prev/cur to avoid out-of-bounds string access. Also treat "i" as index of the last match instead of a length because in case of a complete match of the two strings i was off by one. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| | * Fix support for "depot-path" in older git-p4 importsSimon Hausmann2007-06-07
| | | | | | | | | | | | Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| * | print error message when p4 print fails (eg. due to permission problems)Han-Wen Nienhuys2007-06-08
| |/ | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * look for 'text' and 'binary' files.Han-Wen Nienhuys2007-06-05
| | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * thinko: really ignore deleted files.Han-Wen Nienhuys2007-05-31
| | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
| * remove debug printHan-Wen Nienhuys2007-05-31
| | | | | | | | Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-31 16:20:18 +0000