author | Junio C Hamano <gitster@pobox.com> | |
Mon, 14 Jul 2008 21:05:35 +0000 (14:05 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 14 Jul 2008 21:05:35 +0000 (14:05 -0700) | ||
commit | 324c2c3177ca5b62b12029ce8821542fc29a2733 | |
tree | 0ed73d907d348e1f82f956c4b9cd28dd6f900009 | tree | snapshot |
parent | dc6282d2013792c0df625527e12a54e40d07b122 | commit | diff |
git-rebase: report checkout failure
When detaching the HEAD to the base commit, the "git checkout" command
could fail if, for example, upstream contains a file that would overrwrite
a local, untracked file. Unconditionally discarding the standard error
stream was done to squelch the progress and notices back when checkout
did not have -q option, but there is no reason to keep doing it anymore.
Noticed by Robert Shearman.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When detaching the HEAD to the base commit, the "git checkout" command
could fail if, for example, upstream contains a file that would overrwrite
a local, untracked file. Unconditionally discarding the standard error
stream was done to squelch the progress and notices back when checkout
did not have -q option, but there is no reason to keep doing it anymore.
Noticed by Robert Shearman.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh | diff | blob | history |