aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add subtree test MakefileDavid A. Greene2012-04-09
| | | | | | | | Add a Makefile to run subtree tests. This is largely copied from the standard test suite with irrelevant targets removed and some paths altered to account for where subtree tests live. Signed-off-by: David A. Greene <greened@obbligato.org>
* Install git-subtree from contribDavid A. Greene2012-04-09
| | | | | | | | | | | | | | Build git-subtree in its contrib directory and install from there. The main Makefile no longer discovers subcommands build in the main build area so we cannot count on it to install git-subtree. The user should make && make install in contrib/subtree to install git-subtree. Change the rule to install the git-subtree manpage. The main Documentation area doesn't directly support installing documentation from other directories so the user will have to do that from within contrib/subtree for now. Signed-off-by: David A. Greene <greened@obbligato.org>
* Use configure settings for git-subtreeDavid A. Greene2012-04-09
| | | | | | | Include config.make.autogen in the git-subtree contrib area to pick up settings for prefix and other such things. Signed-off-by: David A. Greene <greened@obbligato.org>
* Use project config filesDavid A. Greene2012-04-09
| | | | | | Use project-wide files to process documentation for git-subtree. Signed-off-by: David A. Greene <greened@obbligato.org>
* Remove unnecessary git-subtree filesDavid A. Greene2012-04-09
| | | | | | | Remove various files that simply duplicate functionality already provided by the main project files. Signed-off-by: David A. Greene <greened@obbligato.org>
* Set TEST_DIRECTORYDavid A. Greene2012-04-09
| | | | | | | Set TEST_DIRECTORY to the main git test area. This allows the git-subtree out-of-tree tests to run correctly. Signed-off-by: David A. Greene <greened@obbligato.org>
* Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'David A. Greene2012-04-09
|\ | | | | | | | | | | git-subtree-dir: contrib/subtree git-subtree-mainline: e8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d git-subtree-split: d3a04e06c77d57978bb5230361c64946232cc346
| * Use Test HarnessDavid A. Greene2012-02-11
| | | | | | | | | | | | | | Clean up the git-subtree tests to conform the git project conventions and use the existing test harness. Signed-off-by: David A. Greene <greened@obbligato.org>
| * Rename TestDavid A. Greene2012-02-11
| | | | | | | | | | | | Rename the subtree test file to conform with git project conventions. Signed-off-by: David A. Greene <greened@obbligato.org>
| * Move Tests Into SubdirectoryDavid A. Greene2012-02-11
| | | | | | | | | | | | | | Move the git-subtree tests into a "t" subdir to reflect how testing works at the top level. Signed-off-by: David A. Greene <greened@obbligato.org>
| * Skip commit objects that should be trees, rather than copying them.Avery Pennarun2011-02-28
| | | | | | | | | | An improvement on the previous patch, based on more reports from Sum-Wai Low.
| * It's also okay if an expected tree object is actually a commit.Avery Pennarun2011-02-28
| | | | | | | | | | | | ...that happens with submodules sometimes, so don't panic. Reported by Sum-Wai Low.
| * Added check to order of processed commits.Jesse Greenwald2010-11-09
| | | | | | | | | | | | | | With debug messages enabled, "incorrect order" will be output whenever a commit is processed before its parents have been processed. This can be determined by checking to see if a parent isn't mapped to a new commit, but it has been processed.
| * Split cmd now processes commits in topo order.Jesse Greenwald2010-11-09
| | | | | | | | | | | | | | Added the "--topo-order" option to git rev-list. Without this, it seems that the revision list is coming back in reverse order but it is sorted chronologically. This does not gurantee that parent commits are handled before child commits.
| * Fix a few typos/grammar-o's in the preceding commit.Avery Pennarun2010-10-21
| |
| * docs: Description, synopsys, options and examples changes.John Yani2010-10-21
| | | | | | | | | | | | | | | | | | | | | | | | Description: Made the difference from submodules and the subtree merge strategy clearer. Synopsys and options: Synchronize with 'git subtree -h' output. I hope, properly. Examples: Added example descriptions in captions. Small fixes. Signed-off-by: John Yani <vanuan@gmail.com>
| * Fixing eval syntax error.Cole Stanfield2010-10-21
| |
| * Fix typo: an -> aAvery Pennarun2010-08-12
| | | | | | | | Thanks to Vanuan on github.
| * docs: simplify example 1Bryan Larsen2010-07-21
| | | | | | | | | | The documentation was written prior to Wayne Walter's 2-parameter add. Using 2-parameter add in example 1 makes the example much simpler.
| * Another fix for PATH and msysgit.Avery Pennarun2010-06-24
| | | | | | | | | | | | | | | | | | | | Evan Shaw tells me the previous fix didn't work. Let's use this one instead, which he says does work. This fix is kind of wrong because it will run the "correct" git-sh-setup *after* the one in /usr/bin, if there is one, which could be weird if you have multiple versions of git installed. But it works on my Linux and his msysgit, so it's obviously better than what we had before.
| * Merge remote branch 'origin/master'Avery Pennarun2010-06-24
| |\ | | | | | | | | | | | | | | | * origin/master: Fixed regression with splitting out new subtree Use 'git merge -Xsubtree' when git version >= 1.7.0.
| | * Fixed regression with splitting out new subtreePelle Wessman2010-05-20
| | | | | | | | | | | | | | | A folder in a repository that wasn't initially imported as a subtree could no longer be splitted into an entirely new subtree with no parent. A fix and a new test to fix that regression is added here.
| | * Use 'git merge -Xsubtree' when git version >= 1.7.0.Pelle Wessman2010-05-07
| | | | | | | | | | | | | | | | | | | | | | | | It's possible to specify the subdir of a subtree since Git 1.7.0 - adding support for that functionality to make the merge more stable. Also checking for git version - now only uses the new subtree subdir option when on at least 1.7.
| * | (Hopefully) fix PATH setting for msysgit.Avery Pennarun2010-06-24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by Evan Shaw. The problem is that $(git --exec-path) includes a 'git' binary which is incompatible with the one in /usr/bin; if you run it, it gives you an error about libiconv2.dll. You might think we could just add $(git --exec-path) at the *end* of PATH, but then if there are multiple versions of git installed, we could end up with the wrong one; earlier versions used to put git-sh-setup in /usr/bin, so we'd pick up that one before the new one. So now we just set PATH back to its original value right after running git-sh-setup, and we should be okay.
| * Added new 'push' command and 2-parameter form of 'add'.Wayne Walter2010-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | Now you can do: git subtree add --prefix=whatever git://wherever branchname to add a new branch, instead of rather weirdly having to do 'git fetch' first. You can also split and push in one step: git subtree push --prefix=whatever git://wherever newbranch (Somewhat cleaned up by apenwarr.)
| * Docs: cleaning up example textual redundancyDan Sabath2010-02-08
| | | | | | | | Signed-off-by: Dan Sabath <dsabath@whitepages.com>
| * docs: add simple 'add' case to clarify setup.Dan Sabath2010-02-08
| | | | | | | | | | | | | | This patch adds a simple use case for adding a library to an existing repository. Signed-off-by: Dan Sabath <dsabath@whitepages.com>
| * Some recent tests accidentally depended on very new versions of git.Avery Pennarun2010-02-08
| | | | | | | | | | The "--format" option is too new. Use "--pretty=format:" (which means the same thing) instead. Now it works again on git 1.6.0 (at least).
| * Oops. Apparently I didn't run 'make test' after most recent change.Avery Pennarun2010-02-08
| | | | | | | | Thanks to Dan Sabath for pointing that out.
| * Improve checking for existence of the --prefix directory.Avery Pennarun2010-02-08
| | | | | | | | | | For add, the prefix must *not* already exist. For all the other commands, it *must* already exist.
| * Make sure that <prefix> exists when splitting.Win Treese2010-02-06
| | | | | | | | | | And test cases for that check, as well as for an error if no prefix is specified at all.
| * Make tests pass with recent git (1.7.0 and up).Avery Pennarun2010-02-06
| | | | | | | | | | | | | | It seems that in older versions, --message="" was interpreted as "use the default commit message" instead of "use an empty commit message", and git-subtree was depending on this behaviour. Now we don't, so tests pass again.
| * git-subtree.txt: add another example.Win Treese2010-02-05
| |
| * Jakub's changes broke the progress message slightly.Avery Pennarun2010-02-02
| | | | | | | | | | We really need that ^M (\r), not a ^J (\n) if we want the status message to overwrite itself nicely.
| * Merge branch 'master' of git://github.com/psionides/git-subtreeAvery Pennarun2010-02-02
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/psionides/git-subtree: improved rev_is_descendant_of_branch() function added temporary test dirs to gitignore added tests for recent changes fixed bug in commit message for split changed alias for --prefix from -p to -P fix for subtree split not finding proper base for new commits allow using --branch with existing branches if it makes sense added -m/--message option for setting merge commit message added -p alias for --prefix
| | * improved rev_is_descendant_of_branch() functionJakub Suder2010-01-12
| | |
| | * added temporary test dirs to gitignoreJakub Suder2010-01-12
| | |
| | * added tests for recent changesJakub Suder2010-01-12
| | |
| | * fixed bug in commit message for splitJakub Suder2010-01-12
| | |
| | * changed alias for --prefix from -p to -PJakub Suder2010-01-12
| | |
| | * fix for subtree split not finding proper base for new commitsJakub Suder2010-01-10
| | |
| | * allow using --branch with existing branches if it makes senseJakub Suder2010-01-10
| | |
| | * added -m/--message option for setting merge commit messageJakub Suder2010-01-10
| | |
| | * added -p alias for --prefixJakub Suder2010-01-06
| | |
| * | Fix refspecs in given example for git subtree pull.Arlen Cuss2010-02-02
| |/ | | | | | | (Updated slightly by apenwarr)
| * Weird, I forgot to have 'make test' call test.sh.Avery Pennarun2009-11-20
| |
| * make git version dynamic when building documentationBen Walton2009-11-15
| | | | | | | | Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
| * add installation support to MakefileBen Walton2009-11-15
| | | | | | | | Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
| * Oops, forgot a COPYING file. It's GPLv2.Avery Pennarun2009-11-15
| | | | | | | | Thanks to Ben Walton for pointing this out.
| * Add some tips for how to install.Avery Pennarun2009-11-04
| |
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-02 09:10:37 +0000