undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: return non-zero error code if format-patch fails

Browse Source 
Since e481af06 (rebase: Handle cases where format-patch fails) we
notice if format-patch fails and return immediately from
git-rebase--am. We save the return value with ret=$?, but then we
return $?, which is usually zero in this case.

Fix this by returning $ret instead.

Cc: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com>
Helped-by: Jorge Nunes <jorge.nunes@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Clemens Buchacher 2015-07-02 11:11:33 +02:00 committed by Junio C Hamano
parent fdf96a20ac
commit 60d708b220
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--am.sh
View File

@ -78,7 +78,7 @@ else
As a result, git cannot rebase them. As a result, git cannot rebase them.
EOF EOF
return $? return $ret
fi fi
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \