aboutsummaryrefslogtreecommitdiffstats
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2012-01-18stg delete --topStepan Koltsov1-1/+13
2011-09-12Replace the 'stg status' command with the 'git status -s' aliasCatalin Marinas10-54/+39
2011-09-12Allow 'stg reset --hard' to reset the changes in the worktreeCatalin Marinas1-1/+1
2011-06-01Don't clear the list of changed patches when we hit a push conflictKarl Wiberg1-1/+1
2011-06-01Add two tests (one currently failing) for "stg float" causing conflictsKarl Wiberg2-0/+80
2010-10-22Fix stg repair for hidden patchesJuergen Wieferink1-0/+43
2010-05-24edit: Allow setting git tree of a patchGustav HÃ¥llberg1-0/+15
2010-05-15Restore the original applied patches during 'commit'Catalin Marinas1-0/+21
2010-02-05Replace some git commands with stg aliases in test scriptsCatalin Marinas48-110/+110
2010-02-05Record a single transaction for conflicting push operationsCatalin Marinas2-3/+3
2009-11-23undo: Add test that "stg undo --hard" leaves the stgit tree in a consistent s...Gustav HÃ¥llberg1-5/+9
2009-10-28push/pop: Allow "-n0" to do nothingGustav HÃ¥llberg2-33/+82
2009-10-20Pick --revert option (formerly --reverse)Catalin Marinas1-2/+2
2009-09-08Add import -p optionCatalin Marinas2-0/+47
2009-07-15t2800: Adapt to changes in git's conflict markersKarl Wiberg1-2/+15
2009-05-30Remove the resolved commandCatalin Marinas2-3/+3
2009-05-30Add support for merge-friendly branchesCatalin Marinas1-0/+129
2009-05-22Add a --set-tree flag to stg pushDavid KÃ¥gedal1-0/+46
2009-04-09Convert "push" to the lib infrastructureCatalin Marinas6-7/+7
2009-04-09Convert "pop" to the lib infrastructureCatalin Marinas2-4/+4
2009-04-09Convert "sink" to the new infrastructureCatalin Marinas1-1/+1
2009-04-09Add mergetool support to the classic StGit infrastructureCatalin Marinas1-3/+0
2009-04-09Check for local changes with "goto"Catalin Marinas3-4/+4
2009-02-26Rename "stg coalesce" to "stg squash"Karl Hasselström1-7/+7
2008-11-08Add 'pick' test scriptCatalin Marinas1-0/+59
2008-11-08Refresh of remove-e-mail-address-duplicatCatalin Marinas1-0/+33
2008-10-24Teach "stg import" to import patch series from tar archivesClark Williams11-0/+217
2008-09-21Test the new stg delete --spill flagKarl Hasselström1-0/+47
2008-09-21Invoke the correct interactive editorKarl Hasselström2-7/+6
2008-09-21Refactor stgit.commands.editKarl Hasselström1-2/+2
2008-09-21Remove --undo flags from stg commands and docsKarl Hasselström3-6/+6
2008-09-21New refresh testsKarl Hasselström1-1/+28
2008-09-21Convert "stg refresh" to the new infrastructureKarl Hasselström2-2/+2
2008-09-21Make "stg log" show stack log instead of patch logKarl Hasselström1-103/+0
2008-09-21Check for top == head at the start of every transactionKarl Hasselström1-1/+1
2008-09-21Test that stg coalesce handles head != top gracefullyKarl Hasselström1-0/+13
2008-09-21Log and undo external modificationsKarl Hasselström1-0/+65
2008-09-21New command: stg redoKarl Hasselström1-0/+114
2008-09-21New command: stg undoKarl Hasselström2-0/+134
2008-09-21Add a --hard flag to stg resetKarl Hasselström1-0/+53
2008-09-21New command: stg resetKarl Hasselström1-0/+160
2008-09-19Merge branch 'stable'Catalin Marinas1-11/+49
2008-09-18Fix the sink command for various test casesCatalin Marinas1-11/+49
2008-09-09Merge branch 'stable'Catalin Marinas1-0/+11
2008-09-09Fix import to work properly in subdirectoriesCatalin Marinas1-0/+11
2008-08-27Merge branch 'stable'Karl Hasselström5-18/+18
2008-08-26Don't use the dashed for of git commandsKarl Hasselström5-20/+20
2008-08-21Fix some remaining old-style stg id callsKarl Hasselström1-5/+5
2008-08-21Remove the applied/unapplied commandsCatalin Marinas18-119/+119
2008-08-21Convert git_id() to the new id formatCatalin Marinas1-1/+1
2008-08-21Implement a new patch identification scheme and id commandCatalin Marinas4-17/+13
2008-08-04Add some tests of refreshing removed filesKarl Hasselström1-0/+101
2008-07-25Test operations on hidden patchesKarl Hasselström4-3/+71
2008-07-25Make sure that stg uncommit doesn't touch the branch headKarl Hasselström1-1/+1
2008-07-24stg uncommit should never touch the branch headKarl Hasselström2-0/+31
2008-07-24Test for exit code with command_error()Karl Hasselström1-1/+1
2008-07-24Merge branch 'stable'Karl Hasselström1-0/+46
2008-07-18Test that we can add a new file to a non-topmost patch with refresh -pKarl Hasselström1-0/+46
2008-07-08Test for "stg edit"Karl Hasselström1-0/+205
2008-07-08Test for specific exit codeKarl Hasselström24-42/+66
2008-07-08Test "stg status" with -M in stgit.diff-optsKarl Hasselström1-0/+6
2008-07-08Merge branch 'stable'Karl Hasselström1-0/+11
2008-07-08Don't allow extra diff options with "stg status"Karl Hasselström1-5/+0
2008-07-08Test "stg status" with renamesKarl Hasselström1-0/+16
2008-06-30Merge branch 'stable' into stable-master-mergeKarl Hasselström1-0/+28
2008-06-30Fix "stg sink" with no applied patches (bug 11887)Karl Hasselström1-1/+1
2008-06-30Try "stg sink" without applied patchesKarl Hasselström1-0/+28
2008-06-24Patch to allow import from compressed files (gzip and bzip2)Clark Williams1-0/+42
2008-06-03Merge branch 'stable'Catalin Marinas1-0/+59
2008-06-03Handle refresh of changed files with non-ASCII namesKarl Hasselström1-1/+1
2008-06-03Test for another filename quoting issue in tree_status()Karl Hasselström1-1/+33
2008-06-03Handle changed files with non-ASCII namesKarl Hasselström1-1/+1
2008-06-03Add rebase test for when upstream has deleted a non-ASCII fileKarl Hasselström1-0/+27
2008-05-27Merge branch 'stable'Catalin Marinas1-0/+6
2008-05-27Fix "refresh" failure with moved files (bug 11661)Catalin Marinas1-0/+5
2008-05-20Convert "stg delete" to the new infrastructureKarl Hasselström1-4/+4
2008-05-20Disable patchlog test for "stg new"Karl Hasselström1-2/+0
2008-04-20Use test_cmp instead of diff -u in the test suiteKarl Hasselström4-27/+27
2008-04-20Get rid of backticks in test-lib.shKarl Hasselström1-2/+2
2008-04-20Steal more test-lib.sh updates from gitKarl Hasselström1-40/+139
2008-04-20Use hardcoded author and committer names in testsKarl Hasselström1-4/+4
2008-04-15Merge branch 'stable' into stable-master-mergeKarl Hasselström2-20/+36
2008-04-15Make t1003-new executableKarl Hasselström1-0/+0
2008-04-13Fix problems in t1000-branch-createKarl Hasselström1-20/+36
2008-03-24Test the 'stg rename' commandOnno Kortmann1-0/+47
2008-03-24Fix "stg branch --delete" on a nonexistent branchToby Allsopp1-0/+4
2008-03-24replace "git repo-config" usage by "git config"Peter Oberndorfer4-7/+7
2008-03-20Handle failed pushes differently depending on causeKarl Hasselström1-1/+1
2008-03-20New test: conflicting push in dirty worktreeKarl Hasselström1-0/+35
2008-03-20Make sure that we only uncommit commits with exactly one parentKarl Hasselström1-1/+1
2008-03-20Try uncommitting a commit with not exactly one parentKarl Hasselström1-0/+5
2008-02-23Test the 'stg rename' commandOnno Kortmann1-0/+47
2008-02-14Fix "stg branch --delete" on a nonexistent branchToby Allsopp1-0/+4
2008-02-10Add an --index option to "stg refresh"Peter Oberndorfer1-1/+56
2008-01-29Don't clean away patches with conflictsKarl Hasselström1-1/+1
2008-01-29Add test to ensure that "stg clean" preserves conflicting patchesPavel Roskin1-0/+17
2008-01-18replace "git repo-config" usage by "git config"Peter Oberndorfer4-7/+7
2008-01-10Make "stg goto" subdirectory safeKarl Hasselström1-2/+2
2008-01-10Test that "stg goto" can be called from a subdirectoryKarl Hasselström1-0/+59
2008-01-10Make "stg commit" fancierKarl Hasselström1-6/+6
2007-12-19Re-add the interactive mergeCatalin Marinas1-0/+3
2007-12-19Add "stg coalesce"Karl Hasselström1-0/+31
2007-12-19Remove "stg add"Karl Hasselström18-44/+44
2007-12-19Fix "stg resolved" to work with new conflict representationKarl Hasselström1-3/+3
2007-12-19Ask git about unmerged filesDavid KÃ¥gedal3-5/+11
2007-12-19Added a test case to check what happens when push finds a conflictDavid KÃ¥gedal1-0/+64
2007-12-19Leave working dir and index alone after failed (conflicting) pushDavid KÃ¥gedal2-9/+10
2007-12-08Don't use test_expect_failure for tests that are supposed to workKarl Hasselström1-2/+2
2007-12-08Fix bashismKarl Hasselström1-1/+1
2007-12-07Some clean-up of the branch manipulation commandsCatalin Marinas2-1/+13
2007-12-07Allow 'show' and 'id' to work on non-StGIT branches (bug #10011)Catalin Marinas1-2/+2
2007-12-07Add a test for the 'mail --attach' commandCatalin Marinas1-0/+15
2007-12-04Clean-up if the branch creation fails (bug #10015)Catalin Marinas1-1/+24
2007-12-01Check for disappeared newborn files in git.tree_status (bug #8516)Catalin Marinas2-0/+21
2007-12-01Make Series.refresh_patch automatically save the undo informationCatalin Marinas1-0/+6
2007-11-27Improve the t1205 test for pushCatalin Marinas1-0/+14
2007-11-21Added test case for stg refreshDavid KÃ¥gedal1-0/+65
2007-11-11Rename "stg assimilate" to "stg repair"Karl Hasselström2-21/+17
2007-11-08Simple test for "stg clean"Karl Hasselström1-0/+27
2007-10-23Allow StGIT commands to run correctly in subdirectoriesCatalin Marinas2-0/+22
2007-10-09New test: "stg diff"Karl Hasselström1-0/+37
2007-10-08Make "stg refresh" subdirectory safeKarl Hasselström1-1/+1
2007-10-08New test: try "stg refresh" in a subdirectoryKarl Hasselström1-0/+27
2007-10-08Make "stg push" subdirectory safeKarl Hasselström1-2/+2
2007-10-08New test: Try "stg push" in a subdirectoryKarl Hasselström1-0/+55
2007-10-08Remove the --force flag to "stg rebase" and "stg pull"Karl Hasselström2-38/+0
2007-10-08New test: "stg pop --keep"Karl Hasselström1-0/+42
2007-10-08Test the new powers of "stg assimilate"Karl Hasselström1-0/+59
2007-10-08Teach "stg assimilate" to repair patch reachabilityKarl Hasselström1-7/+5
2007-09-24New policy: Only use test_expect_failure for broken testsKarl Hasselström11-35/+35
2007-09-24Add some more tests of "stg status" outputDavid KÃ¥gedal1-0/+36
2007-09-24New test: make sure tha we can run "stg help"Karl Hasselström1-0/+15
2007-09-22Add simple test for "stg branch --delete"Karl Hasselström1-0/+29
2007-09-14Add patch editing commandCatalin Marinas1-1/+1
2007-09-11Set GIT_TEMPLATE_DIR in the testsuite, like it's done in gitPavel Roskin1-2/+3
2007-09-03Test "stg status" more thoroughlyKarl Hasselström1-2/+112
2007-08-31Add basic test for stg statusDavid KÃ¥gedal1-0/+15
2007-08-26Don't use test_expect_failure when more than one thing could failKarl Hasselström1-2/+2
2007-08-23Fixed indeterminism in t2102-pull-policy-rebaseDavid KÃ¥gedal1-1/+1
2007-08-23Don't touch ref files manuallyKarl Hasselström3-33/+6
2007-08-20New test: make sure that StGIT can handle packed refsKarl Hasselström1-0/+24
2007-08-20Test that all branch config information is renamedKarl Hasselström1-1/+2
2007-08-20Verify patch status during the testKarl Hasselström1-23/+32
2007-08-20New test: make sure that popping doesn't change patch orderKarl Hasselström1-0/+33
2007-07-18Allow refresh --annotate to replace the top log entryCatalin Marinas1-2/+5
2007-07-16Allow 'refresh' to annotate the patch log entriesCatalin Marinas1-11/+18
2007-06-25Fix t1200 to catch intermediate errors.Yann Dirson1-2/+2
2007-06-25Changed sync not to use -b which has other semantics.Yann Dirson1-4/+4
2007-06-16Update test-lib.sh from current git.Yann Dirson1-21/+107
2007-06-16Revert 'Test "stg rebase" after "stg commit"'Yann Dirson1-16/+0
2007-06-12Test "stg rebase" after "stg commit"Yann Dirson1-0/+16
2007-06-08Fix the hidden patches functionality (bug #9077)Catalin Marinas1-11/+2
2007-06-07Catch early trying rebasing to unknown ref, and add testcase.Yann Dirson1-0/+12
2007-06-07Robustify rebase test: check patches are reapplied.Yann Dirson1-1/+2
2007-06-04Fix deletion and move of a hidden patch (gna bug #9244).Yann Dirson1-2/+11
2007-05-21Test the format version upgrade codeKarl Hasselström5-0/+115
2007-05-21Have only a single command in each test_expect_failureKarl Hasselström1-28/+43
2007-05-15Uncommit to a named commitKarl Hasselström1-0/+8
2007-05-15Make the "name" argument to "stg new" optionalKarl Hasselström1-0/+29
2007-05-14Use "stg applied" instead of reading the applied file directlyKarl Hasselström1-7/+7
2007-05-14Test patch order, not just number of patchesKarl Hasselström1-10/+27
2007-05-14Make patch deletion test more specificKarl Hasselström1-19/+19
2007-05-14Don't use refs/bases/<branchname>Karl Hasselström4-21/+9
2007-05-14dash doesn't do curly brace expansion, so avoid thatKarl Hasselström2-3/+28
2007-05-14String comparison is done with "=", not "=="Karl Hasselström4-25/+25
2007-03-16Add a script to quickly run an interactive test session.Yann Dirson1-0/+12
2007-03-12Fixed t2102-pull-policy-rebase to really test 'rebase' policy.Yann Dirson1-44/+35
2007-03-06[Revert] Make 'push --undo' saferCatalin Marinas3-3/+1
2007-02-28Add a testcase for the safety of pull-policy='pull'.Yann Dirson2-0/+130
2007-02-21Rework of the 'stg pull' policy.Yann Dirson1-0/+72
2007-02-21Support for pre-1.5 git in stgit tests.Yann Dirson1-1/+1
2007-02-13Fix the behaviour when there is no user information configuredCatalin Marinas2-4/+5
2007-02-13Make StGIT aware of the STGIT_DEBUG_LEVEL environment variableCatalin Marinas1-0/+1
2007-02-04Assorted typosPavel Roskin2-2/+2
2007-01-25Hide the test_create_repo outputCatalin Marinas1-2/+2
2007-01-21Add new 'rebase' command.Yann Dirson1-0/+33
2007-01-12Track the files conflict historyCatalin Marinas1-0/+11
2006-12-07Add the 'sync' commandCatalin Marinas2-1/+128
2006-12-07Make 'push --undo' saferCatalin Marinas2-1/+2
2006-12-05Allow the cloning of branches not under StGIT controlCatalin Marinas1-0/+44
2006-12-05Set HOME to the test directory to avoid reading ~/.stgitrcPavel Roskin1-1/+2
2006-11-16Regression test for "stg mail"Karl Hasselström1-0/+34
2006-11-16Regression test for "stg import"Karl Hasselström7-0/+326
2006-11-02Allow deletion of several patches at onceKarl Hasselström2-0/+164
2006-11-02Fixes "stg goto `stg top`" to no-op & adds testIlpo Järvinen1-0/+32
2006-10-25Regression test for "stg assimilate"Karl Hasselström1-0/+86
2006-10-17New command 'float' to move a patch to the topRobin Rosenberg1-0/+56
2006-09-15Add patch history supportCatalin Marinas2-0/+85
2006-07-14Automatically generate patch names for uncommitCatalin Marinas1-0/+73
2006-07-05Add '--' to git-diff-index callsCatalin Marinas1-0/+55
2006-06-11Fix the t0001-subdir-branches.sh testCatalin Marinas1-1/+1
2006-06-11Fix the t1201-pull-trailing.sh testCatalin Marinas1-2/+2
2006-05-18Tests for branch names with slashesKarl Hasselström1-0/+59
2006-05-08Add .gitignore files, list generated files therePavel Roskin1-0/+1
2006-05-03Fixes to the pull testcases.Yann Dirson1-1/+13
2006-05-02Exercise "stg pull" on patches just appending lines.Yann Dirson1-0/+48
2006-05-02Test that pulls a patch creating a file that got modified afterwardsYann Dirson1-0/+64
2006-05-02Fix a seriously bad interaction between .git caching and repo cloningYann Dirson1-0/+36
2006-05-02Correctly handle refs/patches on series renameYann Dirson1-0/+32
2006-05-02Add a couple of safety checks to series creationYann Dirson1-0/+82