diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-03-14 20:16:48 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-06-01 08:16:49 +0000 |
| commit | fe36c5cb189705f411598e2352d92a6ed76dbf2d (patch) | |
| tree | 58fde62ea6d632694391879a0a18dcc9b2982887 | |
| parent | d6f7767bb7de573aba86da9ff32821b159a4bbc7 (diff) | |
gpush/gpick: improve debug info in apply_diff()
Change-Id: I35bd8dee8d4d10d5470d7247969c7a96858001db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | bin/git_gpush.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/git_gpush.pm b/bin/git_gpush.pm index 6d08a48..e89cb7f 100644 --- a/bin/git_gpush.pm +++ b/bin/git_gpush.pm @@ -1586,7 +1586,10 @@ sub apply_diff($$$) my $errors = get_process_output($proc, 'stderr') if ($flags & USE_STDERR); close_process($proc); - return (undef, $errors) if ($?); + if ($?) { + print "Diff application failed.\n" if ($debug); + return (undef, $errors); + } $curr_tree = read_cmd_line(0, 'git', 'write-tree'); return ($curr_tree, undef); } |