From 4072ca1865fa1a993813f2aedfe4d1d54649c757 Mon Sep 17 00:00:00 2001 From: hiifong Date: Sat, 11 Jan 2025 00:39:34 +0800 Subject: [PATCH 1/7] Fix --- services/gitdiff/gitdiff.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index f42686bb7187d..a411f643e8bb2 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1137,7 +1137,9 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi actualBeforeCommitID := opts.BeforeCommitID if len(actualBeforeCommitID) == 0 { parentCommit, _ := commit.Parent(0) - actualBeforeCommitID = parentCommit.ID.String() + if parentCommit != nil { + actualBeforeCommitID = parentCommit.ID.String() + } } cmdDiff.AddArguments("diff", "--src-prefix=\\a/", "--dst-prefix=\\b/", "-M"). @@ -1145,7 +1147,6 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi AddDynamicArguments(actualBeforeCommitID, opts.AfterCommitID) opts.BeforeCommitID = actualBeforeCommitID - var err error beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID) if err != nil { return nil, err From e69478bcd7e2d22a56c6b4a0b4f8983b23293d93 Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 21:27:05 +0800 Subject: [PATCH 2/7] Update --- services/gitdiff/gitdiff.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index a411f643e8bb2..f046e596782f0 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1136,10 +1136,11 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi } else { actualBeforeCommitID := opts.BeforeCommitID if len(actualBeforeCommitID) == 0 { - parentCommit, _ := commit.Parent(0) - if parentCommit != nil { - actualBeforeCommitID = parentCommit.ID.String() + parentCommit, err := commit.Parent(0) + if err != nil { + return nil, err } + actualBeforeCommitID = parentCommit.ID.String() } cmdDiff.AddArguments("diff", "--src-prefix=\\a/", "--dst-prefix=\\b/", "-M"). From 2a559c929aebc6dd1f66fac2404cf366efb6c27b Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 21:58:43 +0800 Subject: [PATCH 3/7] Add test --- services/gitdiff/gitdiff_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index 1017d188dd53a..949a8ac59d141 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -667,3 +667,15 @@ func TestNoCrashes(t *testing.T) { ParsePatch(db.DefaultContext, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(testcase.gitdiff), "") } } + +func TestParentCommitNotExits(t *testing.T) { + gitRepo, err := git.OpenRepository(git.DefaultContext, "./testdata/parent-commit-not-exits") + require.NoError(t, err) + defer gitRepo.Close() + + diff, err := GetDiff(git.DefaultContext, gitRepo, &DiffOptions{ + AfterCommitID: "d01637fe74c3727d9d1e5f691f343988d3e5342f", + }) + assert.ErrorContains(t, err, "object does not exist [id: af35b81c4c8bd963b77b51b207ae4dc90e1904af, rel_path: ]") + assert.Nil(t, diff) +} From 10dc60231b2a0ff987de3ed0f00e7149f59644cd Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 22:02:46 +0800 Subject: [PATCH 4/7] Add testdata --- .../testdata/parent-commit-not-exits/HEAD | 1 + .../testdata/parent-commit-not-exits/config | 8 + .../parent-commit-not-exits/description | 1 + .../hooks/applypatch-msg.sample | 15 ++ .../hooks/commit-msg.sample | 24 +++ .../hooks/fsmonitor-watchman.sample | 174 ++++++++++++++++++ .../hooks/post-update.sample | 8 + .../hooks/pre-applypatch.sample | 14 ++ .../hooks/pre-commit.sample | 49 +++++ .../hooks/pre-merge-commit.sample | 13 ++ .../hooks/pre-push.sample | 53 ++++++ .../hooks/pre-rebase.sample | 169 +++++++++++++++++ .../hooks/pre-receive.sample | 24 +++ .../hooks/prepare-commit-msg.sample | 42 +++++ .../hooks/push-to-checkout.sample | 78 ++++++++ .../hooks/update.sample | 128 +++++++++++++ .../parent-commit-not-exits/info/exclude | 6 + ...5985523f4c8a8da9888000d67e90f90812b608.idx | Bin 0 -> 1156 bytes ...985523f4c8a8da9888000d67e90f90812b608.pack | Bin 0 -> 915 bytes .../parent-commit-not-exits/packed-refs | 2 + .../testdata/parent-commit-not-exits/shallow | 1 + 21 files changed, 810 insertions(+) create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/HEAD create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/config create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/description create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample create mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/update.sample create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/info/exclude create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/packed-refs create mode 100644 services/gitdiff/testdata/parent-commit-not-exits/shallow diff --git a/services/gitdiff/testdata/parent-commit-not-exits/HEAD b/services/gitdiff/testdata/parent-commit-not-exits/HEAD new file mode 100644 index 0000000000000..b870d82622c1a --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/services/gitdiff/testdata/parent-commit-not-exits/config b/services/gitdiff/testdata/parent-commit-not-exits/config new file mode 100644 index 0000000000000..2be30482e697f --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + mirror = true diff --git a/services/gitdiff/testdata/parent-commit-not-exits/description b/services/gitdiff/testdata/parent-commit-not-exits/description new file mode 100644 index 0000000000000..498b267a8c781 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample new file mode 100755 index 0000000000000..a5d7b84a67345 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample new file mode 100755 index 0000000000000..b58d1184a9d43 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000000000..23e856f5deeb7 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample new file mode 100755 index 0000000000000..ec17ec1939b7c --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample new file mode 100755 index 0000000000000..4142082bcb939 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample new file mode 100755 index 0000000000000..e144712c85c05 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample new file mode 100755 index 0000000000000..399eab1924e39 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample new file mode 100755 index 0000000000000..4ce688d32b753 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample new file mode 100755 index 0000000000000..6cbef5c370d8c --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample new file mode 100755 index 0000000000000..a1fd29ec14823 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000000000..10fa14c5ab013 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample new file mode 100755 index 0000000000000..af5a0c0018b5e --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/info/exclude b/services/gitdiff/testdata/parent-commit-not-exits/info/exclude new file mode 100644 index 0000000000000..a5196d1be8fb5 --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx b/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx new file mode 100644 index 0000000000000000000000000000000000000000..afcf3fc35eac0eb1c67419542b9025bd1b74adb1 GIT binary patch literal 1156 zcmexg;-AdGz`z8=qhK@ys2u`~Km$h#2IV1YVP>FNbj4F+CI7EesrtM15KCd;^=H#A zdV7~$5HtT*a=55=u3UVkyoqJU<)FH%08 znd$q?>ow5X(LlHJ0BLQL$krfxpRV4O9SscE>L&c;5ZcC3uDbP0_v%M${@pX$y{VSF J*tTljegIV?I=%n^ literal 0 HcmV?d00001 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack b/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack new file mode 100644 index 0000000000000000000000000000000000000000..0969bc62f0f95b41c3e438c5ee10e21c22cbb284 GIT binary patch literal 915 zcmV;E18n?IK|@Ob00062000A)L3o^vlgF~7Rsclze8t^U9$i4Bsu|Y+B1z;R!j5ps z=^-Q}zJA7bdFO?DdAh52XIl{hh+_DPggimOoTxY!aT!;zkl{GKfCXK^jE6MESJ;xR zXxczlQFP7`#kt_}l4q!#WpkRyNyujCToyb;1P{+yg=NpJnOD%XZ8c9d_+I^Nhxyxd z{0Rt_VmO9iNfzLcgAgm`acs8@{l9g+)Q`3XfBY3uR&@(FssnsowS*w_7{O_`Q=hn5U$ca%i$KDBtPhENekq-G)~NOkZ2%Q5h~dF{V1j?@g-tYH?Rn{pKc-0mletmK>AqW4~h z)Zqvp_>@EiN7{*Ye5tl7VN1fJOXg^0%yOfSll;_gTgSbU9RtPlR=*Xk8|{eV$nwP1 z7h});x6(#RO9=WGuAc|;e9Ll%9n8}nMf8mKmJPo|+rOv_2Hp=mC{p+`D(%`xXI~up zpzQ3xs9-A34arN**eBtQx-sTc=yB=og8@HGogpcct~CRBdaeb2^p~$y zzh*FNf?2}-Wn$WsZ-*p_XG4)sQvABVcO&5q@4oOD$RopM;<4H0nLc=~dKr^)RHX4W zIVVr+Xd>wijo#c<4z)|Yza}!}Erjfyb%}DYObp=8<}B(|41~78sh;F=w<hM`py#9^BZqc7nNKgNpE7PoHqtOH7#;(u-Q-MF*s2!>w<=^`}Q)$Cf`W0 z3mL6<{9=*|pST9rjQhGot?izeSA|+43|RU8;c)HBpSHapOFbszYe)%MIYQTKy+s`a zNhV4XWvIio2}PX#0|P&NHD$1WoRO`|e;I>?OPOs5`vpc&Mrfr1c$_mdFfcPQQ3!H% zbn$i7%S~aJ8Y}sKol4c;t%q0&1Ft`ucG26r3;^O?4!yboc$`yK2uLhS%_~tz&d<%w pEK$hIFHuOX$Sf)50swd72_H0Bg;GCEijAp=fB@EhkogD_wg`k)zv}=1 literal 0 HcmV?d00001 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/packed-refs b/services/gitdiff/testdata/parent-commit-not-exits/packed-refs new file mode 100644 index 0000000000000..8ae620fe0f4ff --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +d01637fe74c3727d9d1e5f691f343988d3e5342f refs/heads/main diff --git a/services/gitdiff/testdata/parent-commit-not-exits/shallow b/services/gitdiff/testdata/parent-commit-not-exits/shallow new file mode 100644 index 0000000000000..b729f8db3772d --- /dev/null +++ b/services/gitdiff/testdata/parent-commit-not-exits/shallow @@ -0,0 +1 @@ +d01637fe74c3727d9d1e5f691f343988d3e5342f From 6f9fcdfb76c11e1b1879e92f32d3d8d03c784bc5 Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 22:06:08 +0800 Subject: [PATCH 5/7] Add testdata --- .../parent-commit-not-exits/description | 1 - .../hooks/applypatch-msg.sample | 15 -- .../hooks/commit-msg.sample | 24 --- .../hooks/fsmonitor-watchman.sample | 174 ------------------ .../hooks/post-update.sample | 8 - .../hooks/pre-applypatch.sample | 14 -- .../hooks/pre-commit.sample | 49 ----- .../hooks/pre-merge-commit.sample | 13 -- .../hooks/pre-push.sample | 53 ------ .../hooks/pre-rebase.sample | 169 ----------------- .../hooks/pre-receive.sample | 24 --- .../hooks/prepare-commit-msg.sample | 42 ----- .../hooks/push-to-checkout.sample | 78 -------- .../hooks/update.sample | 128 ------------- .../parent-commit-not-exits/info/exclude | 6 - 15 files changed, 798 deletions(-) delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/description delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample delete mode 100755 services/gitdiff/testdata/parent-commit-not-exits/hooks/update.sample delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/info/exclude diff --git a/services/gitdiff/testdata/parent-commit-not-exits/description b/services/gitdiff/testdata/parent-commit-not-exits/description deleted file mode 100644 index 498b267a8c781..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample deleted file mode 100755 index a5d7b84a67345..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample deleted file mode 100755 index b58d1184a9d43..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample deleted file mode 100755 index 23e856f5deeb7..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; - -# Check the hook interface version -if ($version ne 2) { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree = get_working_dir(); - -my $retry = 1; - -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - -launch_watchman(); - -sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - my $last_update_line = ""; - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - $last_update_line = qq[\n"since": $last_update_token,]; - } - my $query = <<" END"; - ["query", "$git_work_tree", {$last_update_line - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] - }] - END - - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - return $json_pkg->new->utf8->decode($response); -} - -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { - $retry--; - my $response = qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - - eval { launch_watchman() }; - return 0; - } - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} - -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; -} diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample deleted file mode 100755 index ec17ec1939b7c..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample deleted file mode 100755 index 4142082bcb939..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample deleted file mode 100755 index e144712c85c05..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample deleted file mode 100755 index 399eab1924e39..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git merge" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message to -# stderr if it wants to stop the merge commit. -# -# To enable this hook, rename this file to "pre-merge-commit". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" -: diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample deleted file mode 100755 index 4ce688d32b753..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample deleted file mode 100755 index 6cbef5c370d8c..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample deleted file mode 100755 index a1fd29ec14823..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample deleted file mode 100755 index 10fa14c5ab013..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample b/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample deleted file mode 100755 index af5a0c0018b5e..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/hooks/push-to-checkout.sample +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -# An example hook script to update a checked-out tree on a git push. -# -# This hook is invoked by git-receive-pack(1) when it reacts to git -# push and updates reference(s) in its repository, and when the push -# tries to update the branch that is currently checked out and the -# receive.denyCurrentBranch configuration variable is set to -# updateInstead. -# -# By default, such a push is refused if the working tree and the index -# of the remote repository has any difference from the currently -# checked out commit; when both the working tree and the index match -# the current commit, they are updated to match the newly pushed tip -# of the branch. This hook is to be used to override the default -# behaviour; however the code below reimplements the default behaviour -# as a starting point for convenient modification. -# -# The hook receives the commit with which the tip of the current -# branch is going to be updated: -commit=$1 - -# It can exit with a non-zero status to refuse the push (when it does -# so, it must not modify the index or the working tree). -die () { - echo >&2 "$*" - exit 1 -} - -# Or it can make any necessary changes to the working tree and to the -# index to bring them to the desired state when the tip of the current -# branch is updated to the new commit, and exit with a zero status. -# -# For example, the hook can simply run git read-tree -u -m HEAD "$1" -# in order to emulate git fetch that is run in the reverse direction -# with git push, as the two-tree form of git read-tree -u -m is -# essentially the same as git switch or git checkout that switches -# branches while keeping the local changes in the working tree that do -# not interfere with the difference between the branches. - -# The below is a more-or-less exact translation to shell of the C code -# for the default behaviour for git's push-to-checkout hook defined in -# the push_to_deploy() function in builtin/receive-pack.c. -# -# Note that the hook will be executed from the repository directory, -# not from the working tree, so if you want to perform operations on -# the working tree, you will have to adapt your code accordingly, e.g. -# by adding "cd .." or using relative paths. - -if ! git update-index -q --ignore-submodules --refresh -then - die "Up-to-date check failed" -fi - -if ! git diff-files --quiet --ignore-submodules -- -then - die "Working directory has unstaged changes" -fi - -# This is a rough translation of: -# -# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX -if git cat-file -e HEAD 2>/dev/null -then - head=HEAD -else - head=$(git hash-object -t tree --stdin &2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero=$(git hash-object --stdin &2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/info/exclude b/services/gitdiff/testdata/parent-commit-not-exits/info/exclude deleted file mode 100644 index a5196d1be8fb5..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ From 6ed8c2847e02876b6ca494e5193370898d877f5c Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 22:53:09 +0800 Subject: [PATCH 6/7] Fix --- modules/git/diff.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/git/diff.go b/modules/git/diff.go index 833f6220f970d..da0a2f26ba770 100644 --- a/modules/git/diff.go +++ b/modules/git/diff.go @@ -64,7 +64,10 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff } else if commit.ParentCount() == 0 { cmd.AddArguments("show").AddDynamicArguments(endCommit).AddDashesAndList(files...) } else { - c, _ := commit.Parent(0) + c, err := commit.Parent(0) + if err != nil { + return err + } cmd.AddArguments("diff", "-M").AddDynamicArguments(c.ID.String(), endCommit).AddDashesAndList(files...) } case RawDiffPatch: @@ -74,7 +77,10 @@ func GetRepoRawDiffForFile(repo *Repository, startCommit, endCommit string, diff } else if commit.ParentCount() == 0 { cmd.AddArguments("format-patch", "--no-signature", "--stdout", "--root").AddDynamicArguments(endCommit).AddDashesAndList(files...) } else { - c, _ := commit.Parent(0) + c, err := commit.Parent(0) + if err != nil { + return err + } query := fmt.Sprintf("%s...%s", endCommit, c.ID.String()) cmd.AddArguments("format-patch", "--no-signature", "--stdout").AddDynamicArguments(query).AddDashesAndList(files...) } From b42703fc303bf6e0e433c63b41bd47898aaac8ac Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 14 Jan 2025 23:25:52 +0800 Subject: [PATCH 7/7] Fix --- services/gitdiff/gitdiff_test.go | 12 ------------ .../testdata/parent-commit-not-exits/HEAD | 1 - .../testdata/parent-commit-not-exits/config | 8 -------- ...-345985523f4c8a8da9888000d67e90f90812b608.idx | Bin 1156 -> 0 bytes ...345985523f4c8a8da9888000d67e90f90812b608.pack | Bin 915 -> 0 bytes .../testdata/parent-commit-not-exits/packed-refs | 2 -- .../testdata/parent-commit-not-exits/shallow | 1 - 7 files changed, 24 deletions(-) delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/HEAD delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/config delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/packed-refs delete mode 100644 services/gitdiff/testdata/parent-commit-not-exits/shallow diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index 949a8ac59d141..1017d188dd53a 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -667,15 +667,3 @@ func TestNoCrashes(t *testing.T) { ParsePatch(db.DefaultContext, setting.Git.MaxGitDiffLines, setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(testcase.gitdiff), "") } } - -func TestParentCommitNotExits(t *testing.T) { - gitRepo, err := git.OpenRepository(git.DefaultContext, "./testdata/parent-commit-not-exits") - require.NoError(t, err) - defer gitRepo.Close() - - diff, err := GetDiff(git.DefaultContext, gitRepo, &DiffOptions{ - AfterCommitID: "d01637fe74c3727d9d1e5f691f343988d3e5342f", - }) - assert.ErrorContains(t, err, "object does not exist [id: af35b81c4c8bd963b77b51b207ae4dc90e1904af, rel_path: ]") - assert.Nil(t, diff) -} diff --git a/services/gitdiff/testdata/parent-commit-not-exits/HEAD b/services/gitdiff/testdata/parent-commit-not-exits/HEAD deleted file mode 100644 index b870d82622c1a..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/main diff --git a/services/gitdiff/testdata/parent-commit-not-exits/config b/services/gitdiff/testdata/parent-commit-not-exits/config deleted file mode 100644 index 2be30482e697f..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - mirror = true diff --git a/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx b/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.idx deleted file mode 100644 index afcf3fc35eac0eb1c67419542b9025bd1b74adb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1156 zcmexg;-AdGz`z8=qhK@ys2u`~Km$h#2IV1YVP>FNbj4F+CI7EesrtM15KCd;^=H#A zdV7~$5HtT*a=55=u3UVkyoqJU<)FH%08 znd$q?>ow5X(LlHJ0BLQL$krfxpRV4O9SscE>L&c;5ZcC3uDbP0_v%M${@pX$y{VSF J*tTljegIV?I=%n^ diff --git a/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack b/services/gitdiff/testdata/parent-commit-not-exits/objects/pack/pack-345985523f4c8a8da9888000d67e90f90812b608.pack deleted file mode 100644 index 0969bc62f0f95b41c3e438c5ee10e21c22cbb284..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 915 zcmV;E18n?IK|@Ob00062000A)L3o^vlgF~7Rsclze8t^U9$i4Bsu|Y+B1z;R!j5ps z=^-Q}zJA7bdFO?DdAh52XIl{hh+_DPggimOoTxY!aT!;zkl{GKfCXK^jE6MESJ;xR zXxczlQFP7`#kt_}l4q!#WpkRyNyujCToyb;1P{+yg=NpJnOD%XZ8c9d_+I^Nhxyxd z{0Rt_VmO9iNfzLcgAgm`acs8@{l9g+)Q`3XfBY3uR&@(FssnsowS*w_7{O_`Q=hn5U$ca%i$KDBtPhENekq-G)~NOkZ2%Q5h~dF{V1j?@g-tYH?Rn{pKc-0mletmK>AqW4~h z)Zqvp_>@EiN7{*Ye5tl7VN1fJOXg^0%yOfSll;_gTgSbU9RtPlR=*Xk8|{eV$nwP1 z7h});x6(#RO9=WGuAc|;e9Ll%9n8}nMf8mKmJPo|+rOv_2Hp=mC{p+`D(%`xXI~up zpzQ3xs9-A34arN**eBtQx-sTc=yB=og8@HGogpcct~CRBdaeb2^p~$y zzh*FNf?2}-Wn$WsZ-*p_XG4)sQvABVcO&5q@4oOD$RopM;<4H0nLc=~dKr^)RHX4W zIVVr+Xd>wijo#c<4z)|Yza}!}Erjfyb%}DYObp=8<}B(|41~78sh;F=w<hM`py#9^BZqc7nNKgNpE7PoHqtOH7#;(u-Q-MF*s2!>w<=^`}Q)$Cf`W0 z3mL6<{9=*|pST9rjQhGot?izeSA|+43|RU8;c)HBpSHapOFbszYe)%MIYQTKy+s`a zNhV4XWvIio2}PX#0|P&NHD$1WoRO`|e;I>?OPOs5`vpc&Mrfr1c$_mdFfcPQQ3!H% zbn$i7%S~aJ8Y}sKol4c;t%q0&1Ft`ucG26r3;^O?4!yboc$`yK2uLhS%_~tz&d<%w pEK$hIFHuOX$Sf)50swd72_H0Bg;GCEijAp=fB@EhkogD_wg`k)zv}=1 diff --git a/services/gitdiff/testdata/parent-commit-not-exits/packed-refs b/services/gitdiff/testdata/parent-commit-not-exits/packed-refs deleted file mode 100644 index 8ae620fe0f4ff..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -d01637fe74c3727d9d1e5f691f343988d3e5342f refs/heads/main diff --git a/services/gitdiff/testdata/parent-commit-not-exits/shallow b/services/gitdiff/testdata/parent-commit-not-exits/shallow deleted file mode 100644 index b729f8db3772d..0000000000000 --- a/services/gitdiff/testdata/parent-commit-not-exits/shallow +++ /dev/null @@ -1 +0,0 @@ -d01637fe74c3727d9d1e5f691f343988d3e5342f