path: root/wt-status.h
diff options
authorJeff King <>2008-05-13 08:46:38 (GMT)
committerJunio C Hamano <>2008-05-14 04:45:28 (GMT)
commit0bdf93cbf0afd568384f237378ba368e751a2f0f (patch)
tree91ba78424da9ad1b1cb54fab05b521feb892a8e5 /wt-status.h
parent6d9878cc60ba97fc99aa92f40535644938cad907 (diff)
filter-branch: fix variable export logic
filter-branch tries to restore "old" copies of some environment variables by using the construct: unset var test -z "$old_var" || var="$old_var" && export var This is just wrong. AND-list and OR-list operators && and || have equal precedence and they bind left to right. The second term, var="$old" assignment always succeeds, so we always end up exporting var. On bash and dash, exporting an unset variable has no effect. However, on some shells (such as FreeBSD's /bin/sh), the shell exports the empty value. This manifested itself in this case as git-filter-branch setting GIT_INDEX_FILE to the empty string, which in turn caused its call to git-read-tree to fail, leaving the working tree pointing at the original HEAD instead of the rewritten one. To fix this, we change the short-circuit logic to better match the intent: test -z "$old_var" || { var="$old_var" && export var } Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions