summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_patchin.sh
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-04-06 00:52:37 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-04-06 00:52:37 +0200
commit35b4a4790f14c2f60e170d73a42898d02aab1863 (patch)
tree8633967f6da69691026a72cf37b4605a1d7056ce /scripts/lib/ptxd_make_world_patchin.sh
parent332056f2f4a6adfe9371adabfb3a168338b0abf2 (diff)
downloadptxdist-35b4a4790f14c2f60e170d73a42898d02aab1863.tar.gz
ptxdist-35b4a4790f14c2f60e170d73a42898d02aab1863.tar.xz
[ptxd_make_world_patchin] git: set "para" to sane value
...to avoid using "para" from last cycle. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_patchin.sh')
-rw-r--r--scripts/lib/ptxd_make_world_patchin.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index 5e6da9b37..9aec01f96 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -105,6 +105,11 @@ ptxd_make_world_patchin_apply_git_compat()
local cat
local patch_file="${patch##*/}"
+ case "${para}" in
+ ""|"#"*) para="-p1" ;; # no para or comment
+ -p*) ;;
+ esac
+
case "${patch}" in
""|"#"*) continue ;; # skip empty lines and comments
*.gz) cat="zcat" ;;