4

运行git am我得到上面的错误。手动比较我没有发现任何问题。有人可以指出错误在哪里吗？

$ git am 0012-Do-not-die-when-something-nasty-happen-in-the-comman.patch --reject
Applying: Do not die when something nasty happen in the command
Checking patch lib/Devel/DebugHooks/CmdProcessor.pm...
error: while searching for:
    return 0   unless  $cmd  &&  exists $DB::commands->{ $cmd };

    # The command also should return defined value to keep interaction
    if( defined (my $result =  $DB::commands->{ $cmd }( $args_str )) ) {
        return $result   unless ref $result;

        # Allow commands to evaluate $expr at a debugged script context

error: patch failed: lib/Devel/DebugHooks/CmdProcessor.pm:14
Applying patch lib/Devel/DebugHooks/CmdProcessor.pm with 1 reject...
Rejected hunk #1.
Patch failed at 0001 Do not die when something nasty happen in the command
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

.rej：

$ cat CmdProcessor.pm.rej 
diff a/lib/Devel/DebugHooks/CmdProcessor.pm b/lib/Devel/DebugHooks/CmdProcessor.pm  (rejected hunks)
@@ -14,7 +14,10 @@ sub process {
    return 0   unless  $cmd  &&  exists $DB::commands->{ $cmd };

    # The command also should return defined value to keep interaction
-   if( defined (my $result =  $DB::commands->{ $cmd }( $args_str )) ) {
+   my $result =  eval { $DB::commands->{ $cmd }( $args_str ) };
+   do{ print $DB::OUT "'$cmd' command died: $@"; return 1; }   if $@;
+
+   if( defined $result ) {
        return $result   unless ref $result;

        # Allow commands to evaluate $expr at a debugged script context

来源：

$ cat CmdProcessor.pm 
package Devel::DebugHooks::CmdProcessor;

sub process {
    my( $dbg ) =  shift;

    my( $cmd, $args_str ) =  shift =~ m/^([\w.]+)(?:\s+(.*))?$/;
    $args_str //=  '';


    return 0   unless  $cmd and exists $DB::commands->{ $cmd };

    # The command also should return defined value to keep interaction
    if( defined (my $result =  $DB::commands->{ $cmd }( $args_str )) ) {
        return $result   unless ref $result;

        # Allow commands to evaluate $expr at a debugged script context
        if( ref( $result ) eq 'HASH' ) {
            return $result->{ code }->(
                $args_str
                ,DB::eval( $result->{ expr } ) # FIX: it is not evaled at script context
            );
        }

        return $result;
    }
    else {
        return;
    }


    return 0;
}

1;

行尾是unix。

尝试git apply手动运行会出现下一个错误：

$ git apply CmdProcessor.pm.rej 
fatal: patch fragment without header at line 2: @@ -14,7 +14,10 @@ sub process {
4

1 回答 1

5

git 正在搜索该行

返回 0 除非 $cmd && 存在 $DB::commands->{ $cmd };

但是您的代码包含该行

返回 0 除非 $cmd并且存在 $DB::commands->{ $cmd };

（我标记了&&和and之间的区别）因此补丁不适用。

你可以在这里找到一个关于 git 冲突解决的很好的教程。

于 2016-01-19T07:34:11.047 回答