diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-03-10 16:01:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-06-01 08:17:24 +0000 |
| commit | cbb5cce6ea17e0e84ff6a0b59f75d7834b6215e6 (patch) | |
| tree | fc9a1a12c9512d4d2f5b46a3d45484358d9b2569 | |
| parent | fe36c5cb189705f411598e2352d92a6ed76dbf2d (diff) | |
gpush: print the sha1 of the commit we failed to rebase
one cannot git-show by Change-Id directly, which complicates inspecting
where the conflict occurs.
Change-Id: I77f56325259c8aa972a1740fe51fec324527c308
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rwxr-xr-x | bin/git-gpush | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/git-gpush b/bin/git-gpush index e567d1b..880c4a1 100755 --- a/bin/git-gpush +++ b/bin/git-gpush @@ -1501,9 +1501,10 @@ sub do_rebase_changes($$) } # Failure to apply to the current base is fatal. set_change_error($change, 'fixed', - ",----- Failed to rebase commit ------\n" + ",----- Failed to rebase commit " + .format_id($$commit{id})." ------\n" .($errors =~ s/^/| /mgr) - ."\`------------------------------------\n") + ."\`-----------------------------------------------\n") if (!$failed); # Otherwise it's too much noise. } $$change{freshness} = FAILED; |