diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-10-17 02:50:45 +0100 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 02:54:51 -0400 |
commit | 552cecc21447efe9d5f9a86d55b5e428d56a0c53 (patch) | |
tree | c6dd9228628bd4db04a50539eee64a18f37c56b5 /t | |
parent | git-svn: simplify the handling of fatal errors (diff) | |
download | tgif-552cecc21447efe9d5f9a86d55b5e428d56a0c53.tar.xz |
Teach "git reflog" a subcommand to delete single entries
This commit implements the "delete" subcommand:
git reflog delete master@{2}
will delete the second reflog entry of the "master" branch.
With this, it should be easy to implement "git stash pop" everybody
seems to want these days.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't')
-rwxr-xr-x | t/t1410-reflog.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index e5bbc384f7..12a53edfdc 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -175,4 +175,30 @@ test_expect_success 'recover and check' ' ' +test_expect_success 'delete' ' + echo 1 > C && + test_tick && + git commit -m rat C && + + echo 2 > C && + test_tick && + git commit -m ox C && + + echo 3 > C && + test_tick && + git commit -m tiger C && + + test 5 = $(git reflog | wc -l) && + + git reflog delete master@{1} && + git reflog show master > output && + test 4 = $(wc -l < output) && + ! grep ox < output && + + git reflog delete master@{07.04.2005.15:15:00.-0700} && + git reflog show master > output && + test 3 = $(wc -l < output) && + ! grep dragon < output +' + test_done |