diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t3429-rebase-edit-todo.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t3429-rebase-edit-todo.sh')
-rwxr-xr-x | third_party/git/t/t3429-rebase-edit-todo.sh | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/third_party/git/t/t3429-rebase-edit-todo.sh b/third_party/git/t/t3429-rebase-edit-todo.sh deleted file mode 100755 index 7024d49ae7b9..000000000000 --- a/third_party/git/t/t3429-rebase-edit-todo.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -test_description='rebase should reread the todo file if an exec modifies it' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - -test_expect_success 'setup' ' - test_commit first file && - test_commit second file && - test_commit third file -' - -test_expect_success 'rebase exec modifies rebase-todo' ' - todo=.git/rebase-merge/git-rebase-todo && - git rebase HEAD -x "echo exec touch F >>$todo" && - test -e F -' - -test_expect_success 'loose object cache vs re-reading todo list' ' - GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo && - export GIT_REBASE_TODO && - write_script append-todo.sh <<-\EOS && - # For values 5 and 6, this yields SHA-1s with the same first two digits - echo "pick $(git rev-parse --short \ - $(printf "%s\\n" \ - "tree $EMPTY_TREE" \ - "author A U Thor <author@example.org> $1 +0000" \ - "committer A U Thor <author@example.org> $1 +0000" \ - "" \ - "$1" | - git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO - - shift - test -z "$*" || - echo "exec $0 $*" >>$GIT_REBASE_TODO - EOS - - git rebase HEAD -x "./append-todo.sh 5 6" -' - -test_expect_success 'todo is re-read after reword and squash' ' - write_script reword-editor.sh <<-\EOS && - GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \ - git rebase --edit-todo - EOS - - test_write_lines first third >expected && - set_fake_editor && - GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \ - GIT_EDITOR=./reword-editor.sh git rebase -i --root third && - test_cmp expected actual -' - -test_expect_success 're-reading todo doesnt interfere with revert --edit' ' - git reset --hard third && - - git revert --edit third second && - - cat >expect <<-\EOF && - Revert "second" - Revert "third" - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - -test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' ' - git reset --hard first && - - git cherry-pick --edit second third && - - cat >expect <<-\EOF && - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - -test_done |