| commit | 6745b3c106485f5607d7e1e6251878d429591186 | |
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | |
| Sun, 8 Mar 2009 20:52:14 +0000 (8 21:52 +0100) | ||
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | |
| Sun, 8 Mar 2009 20:52:14 +0000 (8 21:52 +0100) | ||
| tree | 187ad4f38ea98665867564cfc2e87471f32a19be | treesnapshot (tar.gz zip) |
| parent | a20892979b7eebb2218a2744747d68964e1cd48f | commitdiff |
Fix merge failure handling in tg export
There exist two problems that show that up to now the error handling was
completely untested:
- tg.sh uses `set -e`, so `git merge $branch; retmerge=$?` obviously
doesn't do the right thing.
- in recurse_deps stdin is redirected from $_depsfile. Starting a
shell with that doesn't give the user any chance to do something.
Reported-by: "Bernhard R. Link" <brlink@debian.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
There exist two problems that show that up to now the error handling was
completely untested:
- tg.sh uses `set -e`, so `git merge $branch; retmerge=$?` obviously
doesn't do the right thing.
- in recurse_deps stdin is redirected from $_depsfile. Starting a
shell with that doesn't give the user any chance to do something.
Reported-by: "Bernhard R. Link" <brlink@debian.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| tg-export.sh | diffblobblamehistory |